Skip to content

Commit b75dd04

Browse files
mrdoobmrdoob
committed
MeshPhysicalMaterial: Renamed clearCoat* to clearcoat*.
1 parent 786e015 commit b75dd04

34 files changed

+224
-224
lines changed

‎docs/api/en/materials/MeshPhysicalMaterial.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ <h3>[name]( [param:Object parameters] )</h3>
5555
<h2>Properties</h2>
5656
<p>See the base [page:Material] and [page:MeshStandardMaterial] classes for common properties.</p>
5757

58-
<h3>[property:Float clearCoat]</h3>
58+
<h3>[property:Float clearcoat]</h3>
5959
<p>
60-
ClearCoat level, from *0.0* to *1.0*. Default is *0.0*.
60+
Clearcoat level, from *0.0* to *1.0*. Default is *0.0*.
6161
</p>
6262

63-
<h3>[property:Float clearCoatRoughness]</h3>
64-
<p>How rough the clearCoat appears, from *0.0* to *1.0*. Default is *0.0*.</p>
63+
<h3>[property:Float clearcoatRoughness]</h3>
64+
<p>How rough the clearcoat appears, from *0.0* to *1.0*. Default is *0.0*.</p>
6565

6666
<h3>[property:Boolean isMeshPhysicalMaterial]</h3>
6767
<p>

‎docs/api/zh/materials/MeshPhysicalMaterial.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ <h3>[name]( [param:Object parameters] )</h3>
5050
<h2>属性(Properties)</h2>
5151
<p>共有属性请参见其基类[page:Material]。</p>
5252

53-
<h3>[property:Float clearCoat]</h3>
53+
<h3>[property:Float clearcoat]</h3>
5454
<p>
55-
ClearCoat级别，从*0.0*到*1.0*。默认值为*0.0*。
55+
Clearcoat级别，从*0.0*到*1.0*。默认值为*0.0*。
5656
</p>
5757

58-
<h3>[property:Float clearCoatRoughness]</h3>
59-
<p> clearCoat看起来的粗糙程度，从*0.0*到*1.0*。默认值为*0.0*。</p>
58+
<h3>[property:Float clearcoatRoughness]</h3>
59+
<p> clearcoat看起来的粗糙程度，从*0.0*到*1.0*。默认值为*0.0*。</p>
6060

6161
<h3>[property:Boolean isMeshPhysicalMaterial]</h3>
6262
<p> 用于检查此类或派生类是否为Lambert网格材质。默认值为 *true*。<br /><br />

‎docs/scenes/material-browser.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,8 +595,8 @@
595595
folder.add( material, 'roughness', 0, 1 );
596596
folder.add( material, 'metalness', 0, 1 );
597597
folder.add( material, 'reflectivity', 0, 1 );
598-
folder.add( material, 'clearCoat', 0, 1 ).step( 0.01 );
599-
folder.add( material, 'clearCoatRoughness', 0, 1 ).step( 0.01 );
598+
folder.add( material, 'clearcoat', 0, 1 ).step( 0.01 );
599+
folder.add( material, 'clearcoatRoughness', 0, 1 ).step( 0.01 );
600600
folder.add( material, 'flatShading' ).onChange( needsUpdate( material, geometry ) );
601601
folder.add( material, 'wireframe' );
602602
folder.add( material, 'wireframeLinewidth', 0, 10 );

‎editor/js/Sidebar.Material.js‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -225,25 +225,25 @@ Sidebar.Material = function ( editor ) {
225225

226226
container.add( materialShininessRow );
227227

228-
// clearCoat
228+
// clearcoat
229229

230-
var materialClearCoatRow = new UI.Row();
231-
var materialClearCoat = new UI.Number( 1 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
230+
var materialClearcoatRow = new UI.Row();
231+
var materialClearcoat = new UI.Number( 1 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
232232

233-
materialClearCoatRow.add( new UI.Text( strings.getKey( 'sidebar/material/clearcoat' ) ).setWidth( '90px' ) );
234-
materialClearCoatRow.add( materialClearCoat );
233+
materialClearcoatRow.add( new UI.Text( strings.getKey( 'sidebar/material/clearcoat' ) ).setWidth( '90px' ) );
234+
materialClearcoatRow.add( materialClearcoat );
235235

236-
container.add( materialClearCoatRow );
236+
container.add( materialClearcoatRow );
237237

238-
// clearCoatRoughness
238+
// clearcoatRoughness
239239

240-
var materialClearCoatRoughnessRow = new UI.Row();
241-
var materialClearCoatRoughness = new UI.Number( 1 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
240+
var materialClearcoatRoughnessRow = new UI.Row();
241+
var materialClearcoatRoughness = new UI.Number( 1 ).setWidth( '60px' ).setRange( 0, 1 ).onChange( update );
242242

243-
materialClearCoatRoughnessRow.add( new UI.Text( strings.getKey( 'sidebar/material/clearcoatroughness' ) ).setWidth( '90px' ) );
244-
materialClearCoatRoughnessRow.add( materialClearCoatRoughness );
243+
materialClearcoatRoughnessRow.add( new UI.Text( strings.getKey( 'sidebar/material/clearcoatroughness' ) ).setWidth( '90px' ) );
244+
materialClearcoatRoughnessRow.add( materialClearcoatRoughness );
245245

246-
container.add( materialClearCoatRoughnessRow );
246+
container.add( materialClearcoatRoughnessRow );
247247

248248
// vertex colors
249249

@@ -353,19 +353,19 @@ Sidebar.Material = function ( editor ) {
353353

354354
// clearcoat normal map
355355

356-
var materialClearCoatNormalMapRow = new UI.Row();
357-
var materialClearCoatNormalMapEnabled = new UI.Checkbox( false ).onChange( update );
358-
var materialClearCoatNormalMap = new UI.Texture().onChange( update );
359-
var materialClearCoatNormalScaleX = new UI.Number( 1 ).setWidth( '30px' ).onChange( update );
360-
var materialClearCoatNormalScaleY = new UI.Number( 1 ).setWidth( '30px' ).onChange( update );
356+
var materialClearcoatNormalMapRow = new UI.Row();
357+
var materialClearcoatNormalMapEnabled = new UI.Checkbox( false ).onChange( update );
358+
var materialClearcoatNormalMap = new UI.Texture().onChange( update );
359+
var materialClearcoatNormalScaleX = new UI.Number( 1 ).setWidth( '30px' ).onChange( update );
360+
var materialClearcoatNormalScaleY = new UI.Number( 1 ).setWidth( '30px' ).onChange( update );
361361

362-
materialClearCoatNormalMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/clearcoatnormalmap' ) ).setWidth( '90px' ) );
363-
materialClearCoatNormalMapRow.add( materialClearCoatNormalMapEnabled );
364-
materialClearCoatNormalMapRow.add( materialClearCoatNormalMap );
365-
materialClearCoatNormalMapRow.add( materialClearCoatNormalScaleX );
366-
materialClearCoatNormalMapRow.add( materialClearCoatNormalScaleY );
362+
materialClearcoatNormalMapRow.add( new UI.Text( strings.getKey( 'sidebar/material/clearcoatnormalmap' ) ).setWidth( '90px' ) );
363+
materialClearcoatNormalMapRow.add( materialClearcoatNormalMapEnabled );
364+
materialClearcoatNormalMapRow.add( materialClearcoatNormalMap );
365+
materialClearcoatNormalMapRow.add( materialClearcoatNormalScaleX );
366+
materialClearcoatNormalMapRow.add( materialClearcoatNormalScaleY );
367367

368-
container.add( materialClearCoatNormalMapRow );
368+
container.add( materialClearcoatNormalMapRow );
369369

370370
// displacement map
371371

@@ -654,15 +654,15 @@ Sidebar.Material = function ( editor ) {
654654

655655
}
656656

657-
if ( material.clearCoat !== undefined && Math.abs( material.clearCoat - materialClearCoat.getValue() ) >= 0.01 ) {
657+
if ( material.clearcoat !== undefined && Math.abs( material.clearcoat - materialClearcoat.getValue() ) >= 0.01 ) {
658658

659-
editor.execute( new SetMaterialValueCommand( editor, currentObject, 'clearCoat', materialClearCoat.getValue(), currentMaterialSlot ) );
659+
editor.execute( new SetMaterialValueCommand( editor, currentObject, 'clearcoat', materialClearcoat.getValue(), currentMaterialSlot ) );
660660

661661
}
662662

663-
if ( material.clearCoatRoughness !== undefined && Math.abs( material.clearCoatRoughness - materialClearCoatRoughness.getValue() ) >= 0.01 ) {
663+
if ( material.clearcoatRoughness !== undefined && Math.abs( material.clearcoatRoughness - materialClearcoatRoughness.getValue() ) >= 0.01 ) {
664664

665-
editor.execute( new SetMaterialValueCommand( editor, currentObject, 'clearCoatRoughness', materialClearCoatRoughness.getValue(), currentMaterialSlot ) );
665+
editor.execute( new SetMaterialValueCommand( editor, currentObject, 'clearcoatRoughness', materialClearcoatRoughness.getValue(), currentMaterialSlot ) );
666666

667667
}
668668

@@ -817,34 +817,34 @@ Sidebar.Material = function ( editor ) {
817817

818818
}
819819

820-
if ( material.clearCoatNormalMap !== undefined ) {
820+
if ( material.clearcoatNormalMap !== undefined ) {
821821

822-
var clearCoatNormalMapEnabled = materialClearCoatNormalMapEnabled.getValue() === true;
822+
var clearcoatNormalMapEnabled = materialClearcoatNormalMapEnabled.getValue() === true;
823823

824824
if ( objectHasUvs ) {
825825

826-
var clearCoatNormalMap = clearCoatNormalMapEnabled ? materialClearCoatNormalMap.getValue() : null;
826+
var clearcoatNormalMap = clearcoatNormalMapEnabled ? materialClearcoatNormalMap.getValue() : null;
827827

828-
if ( material.clearCoatNormalMap !== clearCoatNormalMap ) {
828+
if ( material.clearcoatNormalMap !== clearcoatNormalMap ) {
829829

830-
editor.execute( new SetMaterialMapCommand( editor, currentObject, 'clearCoatNormalMap', clearCoatNormalMap, currentMaterialSlot ) );
830+
editor.execute( new SetMaterialMapCommand( editor, currentObject, 'clearcoatNormalMap', clearcoatNormalMap, currentMaterialSlot ) );
831831

832832
}
833833

834-
if ( material.clearCoatNormalScale.x !== materialClearCoatNormalScaleX.getValue() ||
835-
material.clearCoatNormalScale.y !== materialClearCoatNormalScaleY.getValue() ) {
834+
if ( material.clearcoatNormalScale.x !== materialClearcoatNormalScaleX.getValue() ||
835+
material.clearcoatNormalScale.y !== materialClearcoatNormalScaleY.getValue() ) {
836836

837837
var value = [
838-
materialClearCoatNormalScaleX.getValue(),
839-
materialClearCoatNormalScaleY.getValue()
838+
materialClearcoatNormalScaleX.getValue(),
839+
materialClearcoatNormalScaleY.getValue()
840840
];
841-
editor.execute( new SetMaterialVectorCommand( editor, currentObject, 'clearCoatNormalScale', value, currentMaterialSlot ) );
841+
editor.execute( new SetMaterialVectorCommand( editor, currentObject, 'clearcoatNormalScale', value, currentMaterialSlot ) );
842842

843843
}
844844

845845
} else {
846846

847-
if ( clearCoatNormalMapEnabled ) textureWarning = true;
847+
if ( clearcoatNormalMapEnabled ) textureWarning = true;
848848

849849
}
850850

@@ -1159,8 +1159,8 @@ Sidebar.Material = function ( editor ) {
11591159
'emissive': materialEmissiveRow,
11601160
'specular': materialSpecularRow,
11611161
'shininess': materialShininessRow,
1162-
'clearCoat': materialClearCoatRow,
1163-
'clearCoatRoughness': materialClearCoatRoughnessRow,
1162+
'clearcoat': materialClearcoatRow,
1163+
'clearcoatRoughness': materialClearcoatRoughnessRow,
11641164
'vertexShader': materialProgramRow,
11651165
'vertexColors': materialVertexColorsRow,
11661166
'depthPacking': materialDepthPackingRow,
@@ -1287,15 +1287,15 @@ Sidebar.Material = function ( editor ) {
12871287

12881288
}
12891289

1290-
if ( material.clearCoat !== undefined ) {
1290+
if ( material.clearcoat !== undefined ) {
12911291

1292-
materialClearCoat.setValue( material.clearCoat );
1292+
materialClearcoat.setValue( material.clearcoat );
12931293

12941294
}
12951295

1296-
if ( material.clearCoatRoughness !== undefined ) {
1296+
if ( material.clearcoatRoughness !== undefined ) {
12971297

1298-
materialClearCoatRoughness.setValue( material.clearCoatRoughness );
1298+
materialClearcoatRoughness.setValue( material.clearcoatRoughness );
12991299

13001300
}
13011301

@@ -1382,18 +1382,18 @@ Sidebar.Material = function ( editor ) {
13821382

13831383
}
13841384

1385-
if ( material.clearCoatNormalMap !== undefined ) {
1385+
if ( material.clearcoatNormalMap !== undefined ) {
13861386

1387-
materialClearCoatNormalMapEnabled.setValue( material.clearCoatNormalMap !== null );
1387+
materialClearcoatNormalMapEnabled.setValue( material.clearcoatNormalMap !== null );
13881388

1389-
if ( material.clearCoatNormalMap !== null || resetTextureSelectors ) {
1389+
if ( material.clearcoatNormalMap !== null || resetTextureSelectors ) {
13901390

1391-
materialClearCoatNormalMap.setValue( material.clearCoatNormalMap );
1391+
materialClearcoatNormalMap.setValue( material.clearcoatNormalMap );
13921392

13931393
}
13941394

1395-
materialClearCoatNormalScaleX.setValue( material.clearCoatNormalScale.x );
1396-
materialClearCoatNormalScaleY.setValue( material.clearCoatNormalScale.y );
1395+
materialClearcoatNormalScaleX.setValue( material.clearcoatNormalScale.x );
1396+
materialClearcoatNormalScaleY.setValue( material.clearcoatNormalScale.y );
13971397

13981398
}
13991399

‎editor/js/Strings.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ var Strings = function ( config ) {
224224
'sidebar/material/emissive': 'Emissive',
225225
'sidebar/material/specular': 'Specular',
226226
'sidebar/material/shininess': 'Shininess',
227-
'sidebar/material/clearcoat': 'ClearCoat',
228-
'sidebar/material/clearcoatroughness': 'ClearCoat Roughness',
227+
'sidebar/material/clearcoat': 'Clearcoat',
228+
'sidebar/material/clearcoatroughness': 'Clearcoat Roughness',
229229
'sidebar/material/vertexcolors': 'Vertex Colors',
230230
'sidebar/material/vertexcolors/no': 'No',
231231
'sidebar/material/vertexcolors/face': 'Face',
@@ -236,7 +236,7 @@ var Strings = function ( config ) {
236236
'sidebar/material/alphamap': 'Alpha Map',
237237
'sidebar/material/bumpmap': 'Bump Map',
238238
'sidebar/material/normalmap': 'Normal Map',
239-
'sidebar/material/clearcoatnormalmap': 'ClearCoat Normal Map',
239+
'sidebar/material/clearcoatnormalmap': 'Clearcoat Normal Map',
240240
'sidebar/material/displacemap': 'Displace Map',
241241
'sidebar/material/roughmap': 'Rough. Map',
242242
'sidebar/material/metalmap': 'Metal. Map',
@@ -508,7 +508,7 @@ var Strings = function ( config ) {
508508
'sidebar/material/alphamap': '透明贴图',
509509
'sidebar/material/bumpmap': '凹凸贴图',
510510
'sidebar/material/normalmap': '法线贴图',
511-
'sidebar/material/clearcoatnormalmap': 'ClearCoat Normal Map',
511+
'sidebar/material/clearcoatnormalmap': 'Clearcoat Normal Map',
512512
'sidebar/material/displacemap': '置换贴图',
513513
'sidebar/material/roughmap': '粗糙贴图',
514514
'sidebar/material/metalmap': '金属贴图',

‎examples/js/loaders/LWOLoader.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2593,11 +2593,11 @@ MaterialParser.prototype = {
25932593

25942594
if ( attributes.Clearcoat && attributes.Clearcoat.value > 0 ) {
25952595

2596-
params.clearCoat = attributes.Clearcoat.value;
2596+
params.clearcoat = attributes.Clearcoat.value;
25972597

25982598
if ( attributes[ 'Clearcoat Gloss' ] ) {
25992599

2600-
params.clearCoatRoughness = 0.5 * ( 1 - attributes[ 'Clearcoat Gloss' ].value );
2600+
params.clearcoatRoughness = 0.5 * ( 1 - attributes[ 'Clearcoat Gloss' ].value );
26012601

26022602
}
26032603

‎examples/js/shaders/TranslucentShader.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ THREE.TranslucentShader = {
187187
" #if defined( RE_IndirectSpecular )",
188188

189189
" vec3 radiance = vec3( 0.0 );",
190-
" vec3 clearCoatRadiance = vec3( 0.0 );",
190+
" vec3 clearcoatRadiance = vec3( 0.0 );",
191191

192192
" #endif",
193193
THREE.ShaderChunk[ "lights_fragment_end" ],

‎examples/jsm/loaders/LWOLoader.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2622,11 +2622,11 @@ MaterialParser.prototype = {
26222622

26232623
if ( attributes.Clearcoat && attributes.Clearcoat.value > 0 ) {
26242624

2625-
params.clearCoat = attributes.Clearcoat.value;
2625+
params.clearcoat = attributes.Clearcoat.value;
26262626

26272627
if ( attributes[ 'Clearcoat Gloss' ] ) {
26282628

2629-
params.clearCoatRoughness = 0.5 * ( 1 - attributes[ 'Clearcoat Gloss' ].value );
2629+
params.clearcoatRoughness = 0.5 * ( 1 - attributes[ 'Clearcoat Gloss' ].value );
26302630

26312631
}
26322632

‎examples/jsm/loaders/sea3d/SEA3DLoader.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2715,8 +2715,8 @@ SEA3D.prototype.materialTechnique =
27152715
techniques[ SEA3DSDK.Material.CLEAR_COAT ] =
27162716
function ( mat, tech ) {
27172717

2718-
mat.clearCoat = tech.strength;
2719-
mat.clearCoatRoughness = tech.roughness;
2718+
mat.clearcoat = tech.strength;
2719+
mat.clearcoatRoughness = tech.roughness;
27202720

27212721
};
27222722

‎examples/jsm/nodes/bsdfs/BlinnShininessExponentNode.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ BlinnShininessExponentNode.prototype.nodeType = "BlinnShininessExponent";
1616

1717
BlinnShininessExponentNode.prototype.generate = function ( builder, output ) {
1818

19-
if ( builder.isCache( 'clearCoat' ) ) {
19+
if ( builder.isCache( 'clearcoat' ) ) {
2020

21-
return builder.format( 'Material_ClearCoat_BlinnShininessExponent( material )', this.type, output );
21+
return builder.format( 'Material_Clearcoat_BlinnShininessExponent( material )', this.type, output );
2222

2323
} else {
2424

0 commit comments

Comments
 (0)