Browse Source

Merge pull request #4787 from paulmasson/patch-1

Add methods .merge and .makeGroups
Mr.doob 11 years ago
parent
commit
e5b2a3ecc4
1 changed files with 6 additions and 0 deletions
  1. 6 0
      docs/api/core/Geometry.html

+ 6 - 0
docs/api/core/Geometry.html

@@ -225,12 +225,18 @@
 		
 		<div>Neither bounding boxes or bounding spheres are computed by default. They need to be explicitly computed, otherwise they are *null*.</div>
 
+		<h3>.merge( [page:Geometry geometry], [page:Matrix4 matrix], [page:Integer materialIndexOffset] )</h3>
+		<div>Merge two geometries or geometry and geometry from object (using object's transform)</div>
+
 		<h3>.mergeVertices()</h3>
 		<div>
 		Checks for duplicate vertices using hashmap.<br />
 		Duplicated vertices are removed and faces' vertices are updated.
 		</div>
 		
+		<h3>.makeGroups()</h3>
+		<div>Geometry splitting</div>
+		
 		<h3>.clone()</h3>
 		<div>
 		Creates a new clone of the Geometry.