Skip to content

Commit

Permalink
Merge pull request #20099 from Mugen87/dev51
Browse files Browse the repository at this point in the history
Docs: Clean up.
  • Loading branch information
mrdoob authored Aug 17, 2020
2 parents 02455cf + 0719888 commit 256ffc2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/api/en/materials/ShaderMaterial.html
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ <h3>[property:String fragmentShader]</h3>

<h3>[property:String glslVersion]</h3>
<p>
Defines the GLSL version of custom shader code. Only relevant for WebGL 2 in order to define whether to use
Defines the GLSL version of custom shader code. Only relevant for WebGL 2 in order to define whether to specify
GLSL 3.0 or not. Valid values are *THREE.GLSL1* or *THREE.GLSL3*. Default is *null*.
</p>

Expand Down
3 changes: 2 additions & 1 deletion docs/api/en/scenes/Scene.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ <h3>[property:boolean autoUpdate]</h3>

<h3>[property:Object background]</h3>
<p>
If not null, sets the background used when rendering the scene, and is always rendered first. Can be set to a [page:Color] which sets the clear color, a [page:Texture] covering the canvas, or a cubemap as a [page:CubeTexture] or [page:WebGLCubeRenderTarget]. Default is null.
If not null, sets the background used when rendering the scene, and is always rendered first.
Can be set to a [page:Color] which sets the clear color, a [page:Texture] covering the canvas, a cubemap as a [page:CubeTexture] or [page:WebGLCubeRenderTarget] or an equirectangular as a [page:Texture] . Default is null.
</p>

<h3>[property:Texture environment]</h3>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/zh/materials/ShaderMaterial.html
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ <h3>[property:String fragmentShader]</h3>

<h3>[property:String glslVersion]</h3>
<p>
Defines the GLSL version of custom shader code. Only relevant for WebGL 2 in order to define whether to use
Defines the GLSL version of custom shader code. Only relevant for WebGL 2 in order to define whether to specify
GLSL 3.0 or not. Valid values are *THREE.GLSL1* or *THREE.GLSL3*. Default is *null*.
</p>

Expand Down
4 changes: 2 additions & 2 deletions docs/api/zh/scenes/Scene.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ <h3>[property:boolean autoUpdate]</h3>

<h3>[property:Object background]</h3>
<p>
若不为空,在渲染场景的时候将设置背景,且背景总是首先被渲染的。
可以设置一个用于的“clear”的[page:Color](颜色)、一个覆盖canvas的[page:Texture](纹理),或是一个[page:CubeTexture]。默认值为null。
If not null, sets the background used when rendering the scene, and is always rendered first.
Can be set to a [page:Color] which sets the clear color, a [page:Texture] covering the canvas, a cubemap as a [page:CubeTexture] or [page:WebGLCubeRenderTarget] or an equirectangular as a [page:Texture] . Default is null.
</p>

<h3>[property:Texture environment]</h3>
Expand Down

0 comments on commit 256ffc2

Please sign in to comment.