Merge remote-tracking branch 'mrdoob/dev'

volos · Sep 19, 2012 · 99b235c · 99b235c
2 parents 0c97c65 + 7d5d4d7
commit 99b235c
Show file tree

Hide file tree

Showing 177 changed files with 9,654 additions and 6,089 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ three.js
 
 The aim of the project is to create a lightweight 3D library with a very low level of complexity — in other words, for dummies. The library provides &lt;canvas&gt;, &lt;svg&gt; and WebGL renderers.
 
-[Examples](http://mrdoob.github.com/three.js/) — [Documentation](http://mrdoob.github.com/three.js/docs/) — [Help](http://stackoverflow.com/questions/tagged/three.js)
+[Examples](http://mrdoob.github.com/three.js/) — [Documentation](http://mrdoob.github.com/three.js/docs/) — [Migrating](https://github.com/mrdoob/three.js/wiki/Migration) — [Help](http://stackoverflow.com/questions/tagged/three.js)
 
 
 ### Usage ###
@@ -65,6 +65,35 @@ This code creates a scene, then creates a camera, adds the camera and cube to th
 
 ### Change log ###
 
+2012 09 15 - **r51** (405,240 KB, gzip: 99,326 KB)
+
+* Added `STLLoader`. ([aleeper](http://github.com/aleeper) and [mrdoob](http://github.com/mrdoob))
+* Optimised `Ray` (2x faster). ([gero3](http://github.com/gero3))
+* Added `.getDescendants` method to `Object3D`. ([gero3](http://github.com/gero3) and [mrdoob](http://github.com/mrdoob))
+* `SkinnedMesh` can now work with `MorphAnimMesh`. ([apendua](http://github.com/apendua))
+* Changed `CameraHelper`. Now it matches the camera independently of where it's in the scene graph. ([mrdoob](http://github.com/mrdoob))
+* Removed the need for manually setting texture units with `ShaderMaterial`. ([alteredq](http://github.com/alteredq))
+* Added `HemisphereLight`. ([alteredq](http://github.com/alteredq))
+* Fixed `WebGLRenderer` handling of flip sided materials. ([WestLangley](http://github.com/WestLangley) and [alteredq](http://github.com/alteredq))
+* Added support to normals maps in `MeshPhongMaterial`. ([crobi](http://github.com/crobi) and [alteredq](http://github.com/alteredq))
+* Added handling of `BufferGeometry` for `ParticleSystems`. ([alteredq](http://github.com/alteredq))
+* Added support for compressed textures and cube maps to `WebGLRenderer`. ([alteredq](http://github.com/alteredq))
+* Outliner and Material panel improvements to the [editor](http://mrdoob.github.com/three.js/editor/). ([mrdoob](http://github.com/mrdoob))
+* Added material.emissive support to `CanvasRenderer` and `SVGRenderer`. ([mrdoob](http://github.com/mrdoob))
+* Added handling of multiple UV layers and anisotropy to Blender exporter. ([alteredq](http://github.com/alteredq))
+* Handling bump and anisotropy in `Loader` and `SceneLoader`. ([alteredq](http://github.com/alteredq))
+* Added mousewheel support to `TrackballControls`. ([jherrm](http://github.com/jherrm))
+* Added `MTLLoader` and `OBJMTLLoader`. ([angelxuanchang](http://github.com/angelxuanchang))
+* Updated `UTF8Loader` to latest version. ([angelxuanchang](http://github.com/angelxuanchang) and [alteredq](http://github.com/alteredq))
+* Pluginized `SceneLoader`. ([alteredq](http://github.com/alteredq))
+* Added support of `object.renderDepth` in `Projector`. ([mrdoob](http://github.com/mrdoob))
+* Made build system more flexible. ([mrdoob](http://github.com/mrdoob))
+* Many enhancements to `SceneLoader`. ([alteredq](http://github.com/alteredq))
+* Experimenting with `CSS3DRenderer`. ([mrdoob](http://github.com/mrdoob))
+* Added `ShapeGeometry`. ([jonobr1](http://github.com/jonobr1))
+* Fixes to `Vector3`'s `.setEulerFromRotationMatrix` method.([WestLangley](http://github.com/WestLangley))
+
+
 2012 08 15 - **r50** (391,250 KB, gzip: 96,143 KB)
 
 * Experimenting with [SoftwareRenderer](http://pouet.net/topic.php?which=8760&page=1). ([mrdoob](http://github.com/mrdoob) and [rygorous](http://github.com/rygorous))

diff --git a/build/three.min.js b/build/three.min.js
diff --git a/docs/api/extras/geometries/CubeGeometry.html b/docs/api/extras/geometries/CubeGeometry.html
@@ -7,29 +7,25 @@
 		<link type="text/css" rel="stylesheet" href="../../../page.css" />
 	</head>
 	<body>
-		<h1>[name]</h1>
+		<h1>CubeGeometry</h1>
 
-		<div class="desc">todo</div>
+		<div class="desc">CubeGeometry is the quadrilateral primitive geometry class. It is typically used for creating a cube or irregular quadrilateral of the dimensions provided within the (optional) 'width', 'height', & 'depth' constructor arguments.</div>
 
 
 		<h2>Constructor</h2>
 
-		<h3>[name]()</h3>
-
-
-		<h2>Properties</h2>
-
-		<h3>.[page:Vector3 todo]</h3>
-
-
-		<h2>Methods</h2>
-
-		<h3>.todo( [page:Vector3 todo] )</h3>
+		<h3>[name]([page:Float width], [page:Float height], [page:Float depth], [page:Integer segmentsWidth], [page:Integer segmentsHeight], [page:Integer segmentsDepth], [page:Array materials], [page:Array sides])</h3>
 		<div>
-		todo — todo<br />
+		width — Width of the sides on the X axis.<br />
+		height — Height of the sides on the Y axis.<br />
+		depth — Depth of the sides on the Z axis.<br />
+		segmentsWidth — Number of segmented faces along the width of the sides.<br />
+		segmentsHeight — Number of segmented faces along the height of the sides.<br />
+		segmentsDepth — Number of segmented faces along the depth of the sides.<br />
+		materials — An array containing six [page:Material]s.<br />
+		sides — An array containig six [page:Boolean]s defining whether the side needs to be created.
 		</div>
 
-
 		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]

diff --git a/docs/api/materials/MeshBasicMaterial.html b/docs/api/materials/MeshBasicMaterial.html
@@ -11,26 +11,75 @@
 
 		<h1>[name]</h1>
 
-		<div class="desc">todo</div>
+		<div class="desc">A material for drawing geometries in a simple shaded (flat or wireframe) way.</div>
+		<div class="desc">The default will render as flat polygons. To draw the mesh as wireframe, simply set the 'wireframe' property to true.</div>
 
 
 		<h2>Constructor</h2>
 
-		<h3>[name]()</h3>
+		<h3>[name]( [page:Object parameters] )</h3>
 
+		<div>parameters is an object with one or more properties defining the material's appearance.</div>
+		<div>
+		color — geometry color in hexadecimal. Default is 0xffffff.<br />
+		wireframe — render geometry as wireframe. Default is false.<br />
+		wireframeLinewidth — Line thickness. Default is 1.<br />
+		wireframeLinecap — Define appearance of line ends. Default is 'round'.<br />
+		wireframeLinejoin — Define appearance of line joints. Default is 'round'.<br />
+		shading — Define shading type. Default is THREE.SmoothShading.<br />
+		vertexColors — Define whether the material uses vertex colors, or not. Default is false.<br />
+		fog — Define whether the material color is affected by global fog settings. Default is false.<br />
+		lightMap — TODO. Default is null.<br />
+		specularMap — TODO. Default is null.<br />
+		envMap — TODO. Default is null.<br />
+		skinning — TODO. Default is false.<br />
+		morphTargets — TODO. Default is false.
+		</div>
 
 		<h2>Properties</h2>
 
-		<h3>.[page:Vector3 todo]</h3>
+		<h3>.[page:Integer color]</h3>
+		<div>Sets the color of the geometry. Default is 0xffffff.</div>
+
+		<h3>.[page:Boolean wireframe]</h3>
+		<div>Render geometry as wireframe. Default is false (i.e. render as flat polygons).</div>
 
+		<h3>.[page:Float wireframeLinewidth]</h3>
+		<div>Controls wireframe thickness. Default is 1.</div>
+
+		<h3>.[page:String wireframeLinecap]</h3>
+		<div>Define appearance of line ends. Possible values are "butt", "round" and "square". Default is 'round'.</div>
+		<div>This setting might not have any effect when used with certain renderers. For example, it is ignored with the [page:WebGLRenderer WebGL] renderer, but does work with the [page:CanvasRenderer Canvas] renderer.</div>
 
-		<h2>Methods</h2>
+		<h3>.[page:String wireframeLinejoin]</h3>
+		<div>Define appearance of line joints. Possible values are "round", "bevel" and "miter". Default is 'round'.</div>
+		<div>This setting might not have any effect when used with certain renderers. For example, it is ignored with the [page:WebGLRenderer WebGL] renderer, but does work with the [page:CanvasRenderer Canvas] renderer.</div>
+
+		<h3>.[page:String shading]</h3>
+		<div>Define shading type. Default is THREE.SmoothShading.</div>
 
-		<h3>.todo( [page:Vector3 todo] )</h3>
-		<div>
-		todo — todo<br />
-		</div>
+		<h3>.[page:Boolean vertexColors]</h3>
+		<div>Define whether the material uses vertex colors, or not. Default is false.</div>
+		<div>This setting might not have any effect when used with certain renderers. For example, it is ignored with the [page:CanvasRenderer Canvas] renderer, but does work with the [page:WebGLRenderer WebGL] renderer.</div>
+
+		<h3>.[page:Boolean fog]</h3>
+		<div>Define whether the material color is affected by global fog settings.</div>
+		<div>This setting might not have any effect when used with certain renderers. For example, it is ignored with the [page:CanvasRenderer Canvas] renderer, but does work with the [page:WebGLRenderer WebGL] renderer.</div>
+
+		<h3>.[page:Texture lightMap]</h3>
+		<div>Set light map. Default is null.</div>
+
+		<h3>.[page:Texture specularMap]</h3>
+		<div>Set specular map. Default is null.</div>
+
+		<h3>.[page:TextureCube envMap]</h3>
+		<div>Set env map. Default is null.</div>
 
+		<h3>.[page:Boolean skinning]</h3>
+		<div>Define whether the material uses skinning. Default is false.</div>
+
+		<h3>.[page:Boolean morphTargets]</h3>
+		<div>Define whether the material uses morphTargets. Default is false.</div>	
 
 		<h2>Source</h2>
 

diff --git a/docs/index.html b/docs/index.html
@@ -84,7 +84,7 @@
 
 		<script src="list.js"></script>
 		<script>
-			var REVISION = '50';
+			var REVISION = '51';
 
 			var panel = document.getElementById( 'panel' );
 			var viewer = document.getElementById( 'viewer' );