Explorar o código

GeometryUtils.merge materialOffset to materialIndexOffset. See #3249.

Mr.doob %!s(int64=12) %!d(string=hai) anos
pai
achega
696794d7c0
Modificáronse 2 ficheiros con 39 adicións e 39 borrados
  1. 36 36
      docs/api/extras/GeometryUtils.html
  2. 3 3
      src/extras/GeometryUtils.js

+ 36 - 36
docs/api/extras/GeometryUtils.html

@@ -9,7 +9,7 @@
 	<body>
 		<h1>[name]</h1>
 
-		<div class="desc">Contains essential function for the geometry manipulations </div>
+		<div class="desc">Contains handy functions geometry manipulations.</div>
 
 
 		<h2>Constructor</h2>
@@ -24,99 +24,99 @@
 
 		<h2>Methods</h2>
 
-		<h3> .merge( [page:Geometry geometry1] , [page:Geometry geometry2], [page:Integer materialOffset] )</h3>
+		<h3> .merge( [page:Geometry geometry1] , [page:Geometry geometry2], [page:Integer materialIndexOffset] )</h3>
 		<div>
 		geometry1 — Parent geomentry element <br />
 		geometry2 — Geometry that need to be added in parent <br />
-		materialOffset — Offset applied to all face material indices. Default : 0 <br />
+		materialIndexOffset — Offset applied to the materialIndex of all the new faces in the merged geometry. Default : 0 <br />
 		</div>
-		
+
 		<h3> .removeMaterials( [page:Geometry geometry1] , [page:Material materialIndexArray] )</h3>
 		<div>
 		geometry — Geometry that need to remove material <br />
 		materialIndex — Material index<br />
 		</div>
-		
+
 		<h3> .randomPointInTriangle( [page:Vector VectorA] , [page:Vector VectorB]  , [page:Vector VectorC])</h3>
 		<div>
 		VectorA — Vector  <br />
 		VectorB — Vector  <br />
 		VectorC — Vector  <br />
-		 
+
 		 returns [page:Int Point]
-		 
+
 		</div>
-		
+
 		<h3> .randomPointInFace( [page:face Face] , [page:geometry Geometry]  , [page:Boolean useCachedAreas])</h3>
 		<div>
 		Face — Face id<br />
 		Geometry — Geometry that contains the Face  <br />
 		useCachedAreas — Flag to use cached areas. Default : False  <br />
-		 
+
 		 returns [page:Int Point]
-		 
+
 		</div>
-		
+
 		<h3> .randomPointsInGeometry( [page:geometry Geometry]  , [page:Integer Points])</h3>
 		<div>
 		Geometry — Geometry  <br />
-	
+
 		 returns [page:Int Point]
-		 
+
 		</div>
-		
+
 		<h3> .binarySearchIndices(  [page:Integer Value] )</h3>
 		<div>
 		Value — Value to search in indices  <br />
-		
+
 		returns [page:Int Position]
 		</div>
-		
+
 		<h3> .triangleArea ( [page:Vector VectorA] , [page:Vector VectorB]  , [page:Vector VectorC]) </h3>
-		
+
 		<div>
 		VectorA — Vector  <br />
 		VectorB — Vector  <br />
 		VectorC — Vector  <br />
-		 
+
 		returns [page:Int Area]
-		 
+
 		</div>
-		
+
 		<h3> .center ( [page:geometry Geometry] ) </h3>
-		
+
 		<div>
-		
+
 		Geometry — Geometry to Center position
-		
+
 		</div>
-		
+
 		<h3> .normalizeUVs ( [page:geometry Geometry] ) </h3>
-		
+
 		<div>
-		
+
 		Geometry — Geometry to normalize UVS <br />
-		
+
 		</div>
-		
+
 		<h3> .triangulateQuads ( [page:geometry Geometry] ) </h3>
-		
+
 		<div>
-		
+
 		Geometry — Geometry to triangulate Quads <br />
-		
+
 		</div>
-		
+
 		<h3> .setMaterialIndex ( [page:geometry Geometry] , [page:Integer index], [page:Face startFace], [page:Face endFace]) </h3>
-		
+
 		<div>
-		
+
 		Geometry — Geometry <br />
 		Index — New index value for the material <br />
 		startFace — Starting range of Face <br />
 		endFace — Final range of Face  <br />
-		
-		</div>	
+
+		</div>
 
 
 		<h2>Source</h2>

+ 3 - 3
src/extras/GeometryUtils.js

@@ -7,7 +7,7 @@ THREE.GeometryUtils = {
 
 	// Merge two geometries or geometry and geometry from object (using object's transform)
 
-	merge: function ( geometry1, object2 /* mesh | geometry */, materialOffset ) {
+	merge: function ( geometry1, object2 /* mesh | geometry */, materialIndexOffset ) {
 
 		var matrix, normalMatrix,
 		vertexOffset = geometry1.vertices.length,
@@ -20,7 +20,7 @@ THREE.GeometryUtils = {
 		uvs1 = geometry1.faceVertexUvs[ 0 ],
 		uvs2 = geometry2.faceVertexUvs[ 0 ];
 
-		materialOffset = materialOffset !== undefined ? materialOffset : 0;
+		if ( materialIndexOffset === undefined ) materialIndexOffset = 0;
 
 		if ( object2 instanceof THREE.Mesh ) {
 
@@ -97,7 +97,7 @@ THREE.GeometryUtils = {
 
 			}
 
-			faceCopy.materialIndex = face.materialIndex + materialOffset;
+			faceCopy.materialIndex = face.materialIndex + materialIndexOffset;
 
 			faceCopy.centroid.copy( face.centroid );