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

Material docs uv patch #11519

Merged
merged 4 commits into from
Jun 15, 2017
Merged

Material docs uv patch #11519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c2879c
Create MeshBasicMaterial.html
NNskelly Jun 15, 2017
131331c
Create MeshLambertMaterial.html
NNskelly Jun 15, 2017
c624cea
Create MeshPhongMaterial.html
NNskelly Jun 15, 2017
af9538b
Create MeshStandardMaterial.html
NNskelly Jun 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions docs/api/materials/MeshBasicMaterial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ <h3>[property:Texture alphaMap]</h3>
</div>

<h3>[property:Texture aoMap]</h3>
<div>The red channel of this texture is used as the ambient occlusion map. Default is null. The aoMap requires a second set of UVs.</div>
<div>The red channel of this texture is used as the ambient occlusion map. Default is null.
The aoMap requires a second set of UVs, and consequently will ignore the [page:Texture repeat]
and [page:Texture offset] Texture properties.</div>

<h3>[property:Float aoMapIntensity]</h3>
<div>Intensity of the ambient occlusion effect. Default is 1. Zero is no occlusion effect.</div>
Expand Down Expand Up @@ -91,7 +93,9 @@ <h3>[property:TextureCube envMap]</h3>
<div>The environment map. Default is null.</div>

<h3>[property:Texture lightMap]</h3>
<div>The light map. Default is null. The lightMap requires a second set of UVs.</div>
<div>The light map. Default is null. The lightMap requires a second set of UVs,
and consequently will ignore the [page:Texture repeat] and [page:Texture offset]
Texture properties.</div>

<h3>[property:Float lightMapIntensity]</h3>
<div>Intensity of the baked light. Default is 1.</div>
Expand Down
8 changes: 6 additions & 2 deletions docs/api/materials/MeshLambertMaterial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ <h3>[property:Texture alphaMap]</h3>
</div>

<h3>[property:Texture aoMap]</h3>
<div>The red channel of this texture is used as the ambient occlusion map. Default is null. The aoMap requires a second set of UVs.</div>
<div>The red channel of this texture is used as the ambient occlusion map. Default is null.
The aoMap requires a second set of UVs, and consequently will ignore the [page:Texture repeat]
and [page:Texture offset] Texture properties.</div>

<h3>[property:Float aoMapIntensity]</h3>
<div>Intensity of the ambient occlusion effect. Default is 1. Zero is no occlusion effect.</div>
Expand Down Expand Up @@ -118,7 +120,9 @@ <h3>[property:Boolean isMeshLambertMaterial]</h3>
</div>

<h3>[property:Texture lightMap]</h3>
<div>The light map. Default is null. The lightMap requires a second set of UVs.</div>
<div>The light map. Default is null. The lightMap requires a second set of UVs,
and consequently will ignore the [page:Texture repeat] and [page:Texture offset]
Texture properties.</div>

<h3>[property:Float lightMapIntensity]</h3>
<div>Intensity of the baked light. Default is 1.</div>
Expand Down
8 changes: 6 additions & 2 deletions docs/api/materials/MeshPhongMaterial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ <h3>[property:Texture alphaMap]</h3>
</div>

<h3>[property:Texture aoMap]</h3>
<div>The red channel of this texture is used as the ambient occlusion map. Default is null. The aoMap requires a second set of UVs.</div>
<div>The red channel of this texture is used as the ambient occlusion map. Default is null.
The aoMap requires a second set of UVs, and consequently will ignore the [page:Texture repeat]
and [page:Texture offset] Texture properties.</div>

<h3>[property:Float aoMapIntensity]</h3>
<div>Intensity of the ambient occlusion effect. Default is 1. Zero is no occlusion effect.</div>
Expand Down Expand Up @@ -151,7 +153,9 @@ <h3>[property:Boolean isMeshPhongMaterial]</h3>


<h3>[property:Texture lightMap]</h3>
<div>The light map. Default is null. The lightMap requires a second set of UVs.</div>
<div>The light map. Default is null. The lightMap requires a second set of UVs,
and consequently will ignore the [page:Texture repeat] and [page:Texture offset]
Texture properties.</div>

<h3>[property:Float lightMapIntensity]</h3>
<div>Intensity of the baked light. Default is 1.</div>
Expand Down
8 changes: 6 additions & 2 deletions docs/api/materials/MeshStandardMaterial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ <h3>[property:Texture alphaMap]</h3>
</div>

<h3>[property:Texture aoMap]</h3>
<div>The red channel of this texture is used as the ambient occlusion map. Default is null. The aoMap requires a second set of UVs.</div>
<div>The red channel of this texture is used as the ambient occlusion map. Default is null.
The aoMap requires a second set of UVs, and consequently will ignore the [page:Texture repeat]
and [page:Texture offset] Texture properties.</div>

<h3>[property:Float aoMapIntensity]</h3>
<div>Intensity of the ambient occlusion effect. Default is 1. Zero is no occlusion effect.</div>
Expand Down Expand Up @@ -178,7 +180,9 @@ <h3>[property:Boolean isMeshStandardMaterial]</h3>


<h3>[property:Texture lightMap]</h3>
<div>The light map. Default is null. The lightMap requires a second set of UVs.</div>
<div>The light map. Default is null. The lightMap requires a second set of UVs,
and consequently will ignore the [page:Texture repeat] and [page:Texture offset]
Texture properties.</div>

<h3>[property:Float lightMapIntensity]</h3>
<div>Intensity of the baked light. Default is 1.</div>
Expand Down