Skip to content

Commit 0f7e38e

Browse files
mrdoobmrdoob
committed
Merge pull request mrdoob#6101 from TatumCreative/specular-bounds
Fixes to small miscellaneous docs issues
2 parents 092aa77 + 62979df commit 0f7e38e

5 files changed

Lines changed: 5 additions & 19 deletions

File tree

‎docs/api/cameras/CubeCamera.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2>Examples</h2>
2424
scene.add( cubeCamera );
2525

2626
//Create car
27-
var chromeMaterial = new THREE.MeshLambertMaterial( { color: 0xffffff, ambient: 0xffffff, envMap: cubeCamera.renderTarget } );
27+
var chromeMaterial = new THREE.MeshLambertMaterial( { color: 0xffffff, envMap: cubeCamera.renderTarget } );
2828
var car = new Mesh( carGeometry, chromeMaterial );
2929
scene.add( car );
3030

‎docs/api/loaders/OBJMTLLoader.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h3>[method:Object3D parse]( [page:String text], [page:Function mtllibCallback]
4747
</div>
4848
<div>
4949
Parse an <em>obj</em> text structure and return an [page:Object3D].<br />
50-
Found objects are converted to [page:Mesh] with a [page:BufferGeometry] and materials are converted to [page:MeshLambertMaterial].
50+
Found objects are converted to a [page:Mesh] and materials are converted to [page:MeshLambertMaterial].
5151
</div>
5252

5353
<h2>Example</h2>

‎docs/api/materials/MeshLambertMaterial.html‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ <h3>[property:Color color]</h3>
4949
Diffuse color of the material. Default is white.<br />
5050
</div>
5151

52-
<h3>[property:Color ambient]</h3>
53-
<div>
54-
Ambient color of the material, multiplied by the color of the [page:AmbientLight]. Default is white.<br />
55-
</div>
56-
5752
<h3>[property:Color emissive]</h3>
5853
<div>
5954
Emissive (light) color of the material, essentially a solid color unaffected by other lighting. Default is black.<br />

‎docs/api/materials/MeshPhongMaterial.html‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ <h3>[name]([page:Object parameters])</h3>
4141
</div>
4242
<div>
4343
Example:<br>
44-
materials.push( new THREE.MeshPhongMaterial( { ambient: 0x030303, color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.FlatShading } ) );
44+
materials.push( new THREE.MeshPhongMaterial( { color: 0xdddddd, specular: 0x009900, shininess: 30, shading: THREE.FlatShading } ) );
4545

4646
</div>
4747

@@ -54,11 +54,6 @@ <h3>[property:Color color]</h3>
5454
Diffuse color of the material. Default is white.<br />
5555
</div>
5656

57-
<h3>[property:Color ambient]</h3>
58-
<div>
59-
Ambient color of the material, multiplied by the color of the [page:AmbientLight]. Default is white.<br />
60-
</div>
61-
6257
<h3>[property:Color emissive]</h3>
6358
<div>
6459
Emissive (light) color of the material, essentially a solid color unaffected by other lighting. Default is black.<br />
@@ -70,7 +65,7 @@ <h3>[property:Color specular]</h3>
7065
</div>
7166

7267
<h3>[property:Float shininess]</h3>
73-
<div>How shiny the specular highlight is; a higher value gives a sharper highlight. Default is *30*.</div>
68+
<div>How shiny the specular highlight is; a higher value gives a sharper highlight. Default is *30*. It should not be set to 0.</div>
7469

7570
<h3>[property:boolean metal]</h3>
7671
<div>

‎docs/scenes/js/material.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ function guiMeshLambertMaterial ( gui, mesh, material, geometry ) {
393393

394394
var data = {
395395
color : material.color.getHex(),
396-
ambient : material.ambient.getHex(),
397396
emissive : material.emissive.getHex(),
398397
envMaps : envMapKeys,
399398
map : textureMapKeys,
@@ -407,7 +406,6 @@ function guiMeshLambertMaterial ( gui, mesh, material, geometry ) {
407406
var folder = gui.addFolder('THREE.MeshLambertMaterial');
408407

409408
folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) );
410-
folder.addColor( data, 'ambient' ).onChange( handleColorChange( material.ambient ) );
411409
folder.addColor( data, 'emissive' ).onChange( handleColorChange( material.emissive ) );
412410

413411
folder.add( material, 'shading', constants.shading ).onChange( needsUpdate( material, geometry ) );
@@ -433,7 +431,6 @@ function guiMeshPhongMaterial ( gui, mesh, material, geometry ) {
433431

434432
var data = {
435433
color : material.color.getHex(),
436-
ambient : material.ambient.getHex(),
437434
emissive : material.emissive.getHex(),
438435
specular : material.specular.getHex(),
439436
envMaps : envMapKeys,
@@ -446,11 +443,10 @@ function guiMeshPhongMaterial ( gui, mesh, material, geometry ) {
446443
var folder = gui.addFolder('THREE.MeshPhongMaterial');
447444

448445
folder.addColor( data, 'color' ).onChange( handleColorChange( material.color ) );
449-
folder.addColor( data, 'ambient' ).onChange( handleColorChange( material.ambient ) );
450446
folder.addColor( data, 'emissive' ).onChange( handleColorChange( material.emissive ) );
451447
folder.addColor( data, 'specular' ).onChange( handleColorChange( material.specular ) );
452448

453-
folder.add( material, 'shininess', 0, 100);
449+
folder.add( material, 'shininess', 1, 100);
454450
folder.add( material, 'shading', constants.shading).onChange( needsUpdate( material, geometry ) );
455451
folder.add( material, 'wireframe' );
456452
folder.add( material, 'wireframeLinewidth', 0, 10 );

0 commit comments

Comments
 (0)