提交 a302b0c9 编写于 作者: T Tristan VALCKE

Merge branch 'dev' into FixCircularReferences

Conflicts:
	src/core/BufferAttribute.js
	src/core/InterleavedBuffer.js
	src/core/InterleavedBufferAttribute.js
	src/materials/Material.js
	src/math/Euler.js
	src/math/Quaternion.js
	src/math/Vector2.js
	src/textures/Texture.js
......@@ -52,12 +52,12 @@ scene.add(rectLight)
<h2>Constructor</h2>
<h3>[name]( [page:Integer color], [page:Float intensity], [page:Float distance], [page:Radians angle], [page:Float penumbra], [page:Float decay] )</h3>
<h3>[name]( [page:Integer color], [page:Float intensity], [page:Float width], [page:Float height] )</h3>
<div>
[page:Integer color] - (optional) hexadecimal color of the light. Default is 0xffffff (white).<br />
[page:Float intensity] - (optional) numeric value of the light's strength/intensity. Default is 1.<br /><br />
[page:Float intensity] - (optional) numeric value of the light's strength/intensity. Default is 1.<br />
[page:Float width] - (optional) width of the light. Default is 10.<br />
[page:Float height] - (optional) height of the light. Default is 10.
[page:Float height] - (optional) height of the light. Default is 10.<br /><br />
Creates a new [name].
</div>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册