Browse Source

Cube.js: Fixed a bug iregular sizes.

Mr.doob 14 years ago
parent
commit
027e8c69e7
2 changed files with 95 additions and 92 deletions
  1. 89 89
      build/ThreeExtras.js
  2. 6 3
      src/extras/primitives/Cube.js

File diff suppressed because it is too large
+ 89 - 89
build/ThreeExtras.js


+ 6 - 3
src/extras/primitives/Cube.js

@@ -60,17 +60,20 @@ var Cube = function ( width, height, depth, segments_width, segments_height, mat
 	this.sides.pz && buildPlane( 'x', 'y',   1 * flip, - 1, width, height, depth_half, this.materials[ 4 ] );   // pz
 	this.sides.nz && buildPlane( 'x', 'y', - 1 * flip, - 1, width, height, - depth_half, this.materials[ 5 ] ); // nz
 
-	mergeVertices();
+	// mergeVertices();
 
 	function buildPlane( u, v, udir, vdir, width, height, depth, material ) {
 
-		var gridX = segments_width || 1,
+		var w,
+		gridX = segments_width || 1,
 		gridY = segments_height || 1,
 		gridX1 = gridX + 1,
 		gridY1 = gridY + 1,
+		width_half = width / 2,
+		height_half = height / 2,
 		segment_width = width / gridX,
 		segment_height = height / gridY,
-		offset = scope.vertices.length, w;
+		offset = scope.vertices.length;
 
 		if ( ( u == 'x' && v == 'y' ) || ( u == 'y' && v == 'x' ) ) {
 

Some files were not shown because too many files changed in this diff