Bläddra i källkod

Merge branch 'dev' of https://github.com/Bjvanminnen/three.js into dev

Mr.doob 11 år sedan
förälder
incheckning
70f4a6c8fa

+ 1 - 1
docs/api/lights/AmbientLight.html

@@ -24,7 +24,7 @@ scene.add( light );</code>
 		<h2>Constructor</h2>
 
 
-		<h3>[name]( [page:Float hex] )</h3>
+		<h3>[name]( [page:Integer hex] )</h3>
 		<div>
 		[page:Integer hex] — Numeric value of the RGB component of the color.
 		</div>

+ 6 - 5
docs/api/lights/AreaLight.html

@@ -24,10 +24,10 @@ scene.add( areaLight1 );</code>
 		<h2>Constructor</h2>
 
 
-		<h3>[name]( [page:Float hex], [page:Float intensity])</h3>
+		<h3>[name]( [page:Integer hex], [page:Float intensity])</h3>
 		<div>
 		[page:Integer hex] — Numeric value of the RGB component of the color.<br />
-		[page:Integer intensity] — The intensity of the light.
+		[page:Float intensity] — Numeric value of the light's strength/intensity.
 		</div>
 		<div>
 		This creates a arealight with color.
@@ -68,10 +68,11 @@ scene.add( areaLight1 );</code>
 		todo
 		</div> 
 
-		<h3>.[page:number intensity]</h3>
+		<h3>.[page:Float intensity]</h3>
 		<div>
-		todo
-		</div> 
+			Light's intensity.<br />
+			Default — *1.0*.
+		</div>
 
 		<h3>.[page:number constantAttenuation]</h3>
 		<div>

+ 3 - 3
docs/api/lights/DirectionalLight.html

@@ -28,10 +28,10 @@ scene.add( directionalLight );</code>
 		<h2>Constructor</h2>
 
 
-		<h3>[name]([page:todo hex], [page:todo intensity])</h3>
+		<h3>[name]([page:Integer hex], [page:Float intensity])</h3>
 		<div>
-		hex -- Numeric value of the RGB component of the color. <br />
-		intensity -- todo
+		[page:Integer hex] -- Numeric value of the RGB component of the color. <br />
+		[page:Float intensity] -- Numeric value of the light's strength/intensity.
 		</div>
 		<div>
 		Creates a light that shines from a specific direction not from a specific position.  This light will behave

+ 3 - 4
docs/api/lights/HemisphereLight.html

@@ -16,11 +16,11 @@
 		<h2>Constructor</h2>
 
 
-		<h3>[name]([page:todo skyColorHex], [page:todo groundColorHex], [page:todo intensity])</h3>
+		<h3>[name]([page:Integer skyColorHex], [page:Integer groundColorHex], [page:Float intensity])</h3>
         <div>
 		[page:Integer skyColorHex] — Numeric value of the RGB sky color.<br />
 		[page:Integer groundColorHex] — Numeric value of the RGB ground color.<br />
-		[page:Integer intensity] — The intensity of the light.
+		[page:Float intensity] — Numeric value of the light's strength/intensity.
 		</div>
 
 		<h2>Properties</h2>
@@ -32,10 +32,9 @@
 		</div>
 
 		<h3>.[page:Float intensity]</h3>
-
 		<div>
 			Light's intensity.<br />
-			Default — *1*.
+			Default — *1.0*.
 		</div>
 
 		<h2>Methods</h2>

+ 3 - 3
docs/api/lights/PointLight.html

@@ -26,10 +26,10 @@ scene.add( light );</code>
 		<h2>Constructor</h2>
 
 
-		<h3>[name]([page:todo hex], [page:todo intensity], [page:todo distance])</h3>
+		<h3>[name]([page:Integer hex], [page:Float intensity], [page:todo distance])</h3>
 		<div>
-		hex -- Numeric value of the RGB component of the color. <br />
-		intensity -- todo <br />
+		[page:Integer hex] — Numeric value of the RGB component of the color. <br />
+		[page:Float intensity] — Numeric value of the light's strength/intensity. <br />
 		distance -- todo
 		</div>
 		<div>

+ 3 - 3
docs/api/lights/SpotLight.html

@@ -38,10 +38,10 @@ scene.add( spotLight );</code>
 		<h2>Constructor</h2>
 
 
-		<h3>[name]([page:todo hex], [page:todo intensity], [page:todo distance], [page:todo angle], [page:todo exponent])</h3>
+		<h3>[name]([page:Integer hex], [page:Float intensity], [page:todo distance], [page:todo angle], [page:todo exponent])</h3>
 		<div>
-		hex -- todo <br />
-		intensity -- todo <br />
+		[page:Integer hex] — Numeric value of the RGB component of the color. <br />
+		[page:Float intensity] — Numeric value of the light's strength/intensity. <br />
 		distance -- todo <br />
 		angle -- todo <br />
 		exponent -- todo