Browse Source

merged with r29

George Profenza 14 years ago
parent
commit
38d3d0a364

File diff suppressed because it is too large
+ 0 - 2
build/Three.js


+ 2 - 2
examples/c4d_dodeca.html

@@ -80,10 +80,10 @@
 				model3.scale = new THREE.Vector3(s*3.2216,s*3.2216,s*3.2216);
 				
 				
-				
+				scene.addObject(model);
 				scene.addObject(model3);
 				scene.addObject(model2);
-				scene.addObject(model);
+				
 				
 				renderer = new THREE.CanvasRenderer();
 				renderer.setSize( SCREEN_WIDTH, SCREEN_HEIGHT );

+ 3 - 0
examples/geometry/BotArmL.js

@@ -104,6 +104,9 @@ var BotArmL = function () {
 	f4( 26, 30, 33, 29, -1.000000, 0.000000, 0.000000 );
 	uv( 0.165964, 0.834036, 0.165964, 0.834036, 0.165964, 0.165964, 0.165964, 0.165964);
 
+	this.computeCentroids();
+	this.computeNormals(true);
+
 	scope.colors = {};
 	scope.selections = {};
 	scope.selections["c1"] = [1, 12, 14, 16, 17, 18, 19, 22, 23, 27];

+ 3 - 0
examples/geometry/BotArmR.js

@@ -130,6 +130,9 @@ var BotArmR = function () {
 	f4( 41, 38, 34, 37, 1.000000, 0.000000, 0.000000 );
 	uv( 0.140674, 0.140674, 0.140674, 0.859326, 0.140674, 0.859326, 0.140674, 0.140674);
 
+	this.computeCentroids();
+	this.computeNormals(true);
+
 	scope.colors = {};
 	scope.selections = {};
 	scope.selections["c1"] = [8, 29, 30, 31, 32];

+ 3 - 0
examples/geometry/BotLowerBody.js

@@ -503,6 +503,9 @@ var BotLowerBody = function () {
 	f4( 141, 145, 236, 240, 1.000000, 0.000000, -0.000000 );
 	f4( 90, 93, 92, 91, 1.000000, 0.000000, -0.000000 );
 
+	this.computeCentroids();
+	this.computeNormals(true);
+
 	scope.colors = {};
 	scope.selections = {};
 	scope.selections["c1"] = [0, 1, 2, 3, 8, 9, 10, 14, 15, 16, 19, 20, 24, 27, 28, 30, 31, 32, 35, 37, 42, 43, 49, 52, 53, 56, 57, 58, 59, 60, 64, 65, 67, 69, 72, 74, 78, 80, 89, 93, 97, 98, 101, 103, 107, 108, 109, 114, 115, 117, 118, 120, 122, 123, 124, 125, 126, 128, 129, 134, 135, 136, 140, 141, 142, 145, 146, 149, 150, 153, 154, 156, 157, 158, 161, 163, 168, 169, 172, 175, 178, 179, 182, 183, 184, 185, 186, 190, 191, 193, 195, 198, 200, 204, 206, 215, 219, 223, 224, 227, 229, 233, 234, 235, 239, 240, 241];

+ 3 - 0
examples/geometry/BotUpperBody.js

@@ -860,6 +860,9 @@ var BotUpperBody = function () {
 	f4( 46, 43, 45, 97, -0.999926, 0.001808, 0.012015 );
 	uv( 0.000000, 1.000000, 1.000000, 1.000000, 1.000000, 0.000000, 0.000000, 0.000000);
 
+	this.computeCentroids();
+	this.computeNormals(true);
+
 	scope.colors = {};
 	scope.selections = {};
 	scope.selections["c1"] = [0, 3, 10, 13, 18, 25, 28, 29, 32, 33, 37, 38, 41, 42, 43, 45, 48, 49, 50, 54, 56, 57, 58, 59, 60, 61, 62, 63, 64, 69, 73, 74, 75, 76, 116, 117, 120, 121, 122, 123, 125, 154, 157, 184, 189, 190, 191, 192, 193, 198, 199, 200, 201, 204, 205, 214, 219, 220, 221, 222, 227, 228, 229, 245, 246, 258, 260, 263, 266, 272, 275, 276];

+ 259 - 240
examples/geometry/DodecaEdges.js

@@ -365,246 +365,265 @@ var DodecaEdges = function () {
 	v( -103.118690, -2.803179, -34.579380 );
 	v( -67.436485, 54.931847, -56.632198 );
 
-	f4( 122, 123, 121, 120, 0.262866, 0.951056, -0.162460 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 124, 125, 123, 122, 0.262866, 0.951056, -0.162460 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 126, 127, 125, 124, -0.525731, 0.000000, -0.850651 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 120, 121, 127, 126, -0.525731, 0.000000, -0.850651 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 130, 131, 129, 128, 0.525731, -0.000000, 0.850651 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 132, 133, 131, 130, 0.525731, -0.000000, 0.850651 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 134, 135, 133, 132, 0.262866, 0.951056, -0.162460 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 128, 129, 135, 134, 0.262866, 0.951056, -0.162460 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 138, 139, 137, 136, -0.262866, -0.951056, 0.162460 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 140, 141, 139, 138, -0.262866, -0.951056, 0.162460 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 142, 143, 141, 140, 0.525731, -0.000000, 0.850651 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 136, 137, 143, 142, 0.525731, -0.000000, 0.850651 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 146, 147, 145, 144, -0.525731, 0.000000, -0.850651 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 148, 149, 147, 146, -0.525731, 0.000000, -0.850651 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 150, 151, 149, 148, -0.262866, -0.951056, 0.162460 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 144, 145, 151, 150, -0.262866, -0.951056, 0.162460 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 154, 155, 153, 152, 0.951057, -0.162460, -0.262866 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 156, 157, 155, 154, 0.951057, -0.162460, -0.262866 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 158, 159, 157, 156, -0.000000, 0.850651, -0.525731 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 152, 153, 159, 158, -0.000000, 0.850651, -0.525731 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 162, 163, 161, 160, 0.000000, -0.850651, 0.525731 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 164, 165, 163, 162, 0.000000, -0.850651, 0.525731 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 166, 167, 165, 164, 0.951057, -0.162460, -0.262866 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 160, 161, 167, 166, 0.951057, -0.162460, -0.262866 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 170, 171, 169, 168, -0.951056, 0.162460, 0.262866 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 172, 173, 171, 170, -0.951056, 0.162460, 0.262866 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 174, 175, 173, 172, 0.000000, -0.850651, 0.525731 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 168, 169, 175, 174, 0.000000, -0.850651, 0.525731 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 178, 179, 177, 176, -0.000000, 0.850651, -0.525731 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 180, 181, 179, 178, -0.000000, 0.850651, -0.525731 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 182, 183, 181, 180, -0.951056, 0.162460, 0.262866 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 176, 177, 183, 182, -0.951056, 0.162460, 0.262866 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 186, 187, 185, 184, 0.000000, 1.000000, 0.000000 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 188, 189, 187, 186, 0.000000, 1.000000, 0.000000 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 190, 191, 189, 188, 0.000000, 0.000000, 1.000000 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 184, 185, 191, 190, 0.000000, 0.000000, 1.000000 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 194, 195, 193, 192, 0.000000, 0.000000, -1.000000 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 196, 197, 195, 194, 0.000000, 0.000000, -1.000000 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 198, 199, 197, 196, 0.000000, 1.000000, 0.000000 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 192, 193, 199, 198, 0.000000, 1.000000, 0.000000 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 202, 203, 201, 200, 0.000000, -1.000000, 0.000000 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 204, 205, 203, 202, 0.000000, -1.000000, 0.000000 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 206, 207, 205, 204, 0.000000, 0.000000, -1.000000 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 200, 201, 207, 206, 0.000000, 0.000000, -1.000000 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 210, 211, 209, 208, 0.000000, 0.000000, 1.000000 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 212, 213, 211, 210, 0.000000, 0.000000, 1.000000 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 214, 215, 213, 212, 0.000000, -1.000000, 0.000000 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 208, 209, 215, 214, 0.000000, -1.000000, 0.000000 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 218, 219, 217, 216, 0.262866, 0.951056, 0.162460 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 220, 221, 219, 218, 0.262866, 0.951056, 0.162460 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 222, 223, 221, 220, -0.525731, 0.000000, 0.850651 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 216, 217, 223, 222, -0.525731, 0.000000, 0.850651 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 226, 227, 225, 224, 0.525731, -0.000000, -0.850651 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 228, 229, 227, 226, 0.525731, -0.000000, -0.850651 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 230, 231, 229, 228, 0.262866, 0.951056, 0.162460 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 224, 225, 231, 230, 0.262866, 0.951056, 0.162460 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 234, 235, 233, 232, -0.262866, -0.951056, -0.162460 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 236, 237, 235, 234, -0.262866, -0.951056, -0.162460 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 238, 239, 237, 236, 0.525731, -0.000000, -0.850651 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 232, 233, 239, 238, 0.525731, -0.000000, -0.850651 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 242, 243, 241, 240, -0.525731, 0.000000, 0.850651 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 244, 245, 243, 242, -0.525731, 0.000000, 0.850651 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 246, 247, 245, 244, -0.262866, -0.951056, -0.162460 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 240, 241, 247, 246, -0.262866, -0.951056, -0.162460 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 250, 251, 249, 248, 0.951056, -0.162460, 0.262866 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 252, 253, 251, 250, 0.951056, -0.162460, 0.262866 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 254, 255, 253, 252, -0.000000, 0.850651, 0.525731 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 248, 249, 255, 254, -0.000000, 0.850651, 0.525731 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 258, 259, 257, 256, 0.000000, -0.850651, -0.525731 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 260, 261, 259, 258, 0.000000, -0.850651, -0.525731 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 262, 263, 261, 260, 0.951056, -0.162460, 0.262866 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 256, 257, 263, 262, 0.951056, -0.162460, 0.262866 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 266, 267, 265, 264, -0.951056, 0.162460, -0.262865 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 268, 269, 267, 266, -0.951056, 0.162460, -0.262865 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 270, 271, 269, 268, 0.000000, -0.850651, -0.525731 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 264, 265, 271, 270, 0.000000, -0.850651, -0.525731 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 274, 275, 273, 272, -0.000000, 0.850651, 0.525731 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 276, 277, 275, 274, -0.000000, 0.850651, 0.525731 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 278, 279, 277, 276, -0.951056, 0.162460, -0.262865 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 272, 273, 279, 278, -0.951056, 0.162460, -0.262865 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 282, 283, 281, 280, 0.000000, 1.000000, 0.000000 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 284, 285, 283, 282, 0.000000, 1.000000, 0.000000 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 286, 287, 285, 284, 0.000000, 0.000000, -1.000000 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 280, 281, 287, 286, 0.000000, 0.000000, -1.000000 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 290, 291, 289, 288, 0.000000, 0.000000, 1.000000 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 292, 293, 291, 290, 0.000000, 0.000000, 1.000000 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 294, 295, 293, 292, 0.000000, 1.000000, 0.000000 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 288, 289, 295, 294, 0.000000, 1.000000, 0.000000 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 298, 299, 297, 296, 0.000000, -1.000000, 0.000000 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 300, 301, 299, 298, 0.000000, -1.000000, 0.000000 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 302, 303, 301, 300, 0.000000, 0.000000, 1.000000 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 296, 297, 303, 302, 0.000000, 0.000000, 1.000000 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 306, 307, 305, 304, 0.000000, 0.000000, -1.000000 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 308, 309, 307, 306, 0.000000, 0.000000, -1.000000 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 310, 311, 309, 308, 0.000000, -1.000000, 0.000000 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 304, 305, 311, 310, 0.000000, -1.000000, 0.000000 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 314, 315, 313, 312, 0.866025, -0.467086, -0.178411 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 316, 317, 315, 314, 0.866025, -0.467086, -0.178411 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 318, 319, 317, 316, 0.000000, -0.356822, 0.934172 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 312, 313, 319, 318, 0.000000, -0.356822, 0.934172 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 322, 323, 321, 320, -0.000000, 0.356822, -0.934172 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 324, 325, 323, 322, -0.000000, 0.356822, -0.934172 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 326, 327, 325, 324, 0.866025, -0.467086, -0.178411 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 320, 321, 327, 326, 0.866025, -0.467086, -0.178411 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 330, 331, 329, 328, -0.866025, 0.467086, 0.178411 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 332, 333, 331, 330, -0.866025, 0.467086, 0.178411 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 334, 335, 333, 332, -0.000000, 0.356822, -0.934172 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 328, 329, 335, 334, -0.000000, 0.356822, -0.934172 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 338, 339, 337, 336, 0.000000, -0.356822, 0.934172 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 340, 341, 339, 338, 0.000000, -0.356822, 0.934172 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 342, 343, 341, 340, -0.866025, 0.467086, 0.178411 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 336, 337, 343, 342, -0.866025, 0.467086, 0.178411 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 346, 347, 345, 344, 1.000000, 0.000000, 0.000000 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 348, 349, 347, 346, 1.000000, 0.000000, 0.000000 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 350, 351, 349, 348, 0.000000, 0.000000, -1.000000 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 344, 345, 351, 350, 0.000000, 0.000000, -1.000000 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
-	f4( 354, 355, 353, 352, 0.000000, 0.000000, 1.000000 );
-	uv( 0.250000, 0.000000, 0.250000, 1.000000, 0.000000, 1.000000 );
-	f4( 356, 357, 355, 354, 0.000000, 0.000000, 1.000000 );
-	uv( 0.500000, 0.000000, 0.500000, 1.000000, 0.250000, 1.000000 );
-	f4( 358, 359, 357, 356, 1.000000, 0.000000, 0.000000 );
-	uv( 0.750000, 0.000000, 0.750000, 1.000000, 0.500000, 1.000000 );
-	f4( 352, 353, 359, 358, 1.000000, 0.000000, 0.000000 );
-	uv( 1.000000, 0.000000, 1.000000, 1.000000, 0.750000, 1.000000 );
+	f4( 120, 121, 123, 122, 0.525731, -0.000000, 0.850651 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 122, 123, 125, 124, 0.525731, -0.000000, 0.850651 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 124, 125, 127, 126, -0.262866, -0.951056, 0.162460 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 126, 127, 121, 120, -0.262866, -0.951056, 0.162460 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 128, 129, 131, 130, -0.262866, -0.951056, 0.162460 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 130, 131, 133, 132, -0.262866, -0.951056, 0.162460 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 132, 133, 135, 134, -0.525731, 0.000000, -0.850651 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 134, 135, 129, 128, -0.525731, 0.000000, -0.850651 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 136, 137, 139, 138, -0.525731, 0.000000, -0.850651 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 138, 139, 141, 140, -0.525731, 0.000000, -0.850651 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 140, 141, 143, 142, 0.262866, 0.951056, -0.162460 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 142, 143, 137, 136, 0.262866, 0.951056, -0.162460 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 144, 145, 147, 146, 0.262866, 0.951056, -0.162460 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 146, 147, 149, 148, 0.262866, 0.951056, -0.162460 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 148, 149, 151, 150, 0.525731, -0.000000, 0.850651 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 150, 151, 145, 144, 0.525731, -0.000000, 0.850651 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 152, 153, 155, 154, 0.000000, -0.850651, 0.525731 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 154, 155, 157, 156, 0.000000, -0.850651, 0.525731 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 156, 157, 159, 158, -0.951056, 0.162460, 0.262866 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 158, 159, 153, 152, -0.951056, 0.162460, 0.262866 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 160, 161, 163, 162, -0.951056, 0.162460, 0.262866 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 162, 163, 165, 164, -0.951056, 0.162460, 0.262866 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 164, 165, 167, 166, -0.000000, 0.850651, -0.525731 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 166, 167, 161, 160, -0.000000, 0.850651, -0.525731 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 168, 169, 171, 170, -0.000000, 0.850651, -0.525731 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 170, 171, 173, 172, -0.000000, 0.850651, -0.525731 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 172, 173, 175, 174, 0.951056, -0.162460, -0.262866 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 174, 175, 169, 168, 0.951056, -0.162460, -0.262866 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 176, 177, 179, 178, 0.951056, -0.162460, -0.262866 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 178, 179, 181, 180, 0.951056, -0.162460, -0.262866 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 180, 181, 183, 182, 0.000000, -0.850651, 0.525731 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 182, 183, 177, 176, 0.000000, -0.850651, 0.525731 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 184, 185, 187, 186, 0.000000, 0.000000, -1.000000 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 186, 187, 189, 188, 0.000000, 0.000000, -1.000000 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 188, 189, 191, 190, 0.000000, -1.000000, 0.000000 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 190, 191, 185, 184, 0.000000, -1.000000, 0.000000 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 192, 193, 195, 194, 0.000000, -1.000000, 0.000000 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 194, 195, 197, 196, 0.000000, -1.000000, 0.000000 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 196, 197, 199, 198, 0.000000, 0.000000, 1.000000 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 198, 199, 193, 192, 0.000000, 0.000000, 1.000000 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 200, 201, 203, 202, 0.000000, 0.000000, 1.000000 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 202, 203, 205, 204, 0.000000, 0.000000, 1.000000 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 204, 205, 207, 206, 0.000000, 1.000000, 0.000000 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 206, 207, 201, 200, 0.000000, 1.000000, 0.000000 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 208, 209, 211, 210, 0.000000, 1.000000, 0.000000 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 210, 211, 213, 212, 0.000000, 1.000000, 0.000000 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 212, 213, 215, 214, 0.000000, 0.000000, -1.000000 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 214, 215, 209, 208, 0.000000, 0.000000, -1.000000 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 216, 217, 219, 218, 0.525731, -0.000000, -0.850651 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 218, 219, 221, 220, 0.525731, -0.000000, -0.850651 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 220, 221, 223, 222, -0.262866, -0.951056, -0.162460 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 222, 223, 217, 216, -0.262866, -0.951056, -0.162460 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 224, 225, 227, 226, -0.262866, -0.951056, -0.162460 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 226, 227, 229, 228, -0.262866, -0.951056, -0.162460 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 228, 229, 231, 230, -0.525731, 0.000000, 0.850651 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 230, 231, 225, 224, -0.525731, 0.000000, 0.850651 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 232, 233, 235, 234, -0.525731, 0.000000, 0.850651 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 234, 235, 237, 236, -0.525731, 0.000000, 0.850651 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 236, 237, 239, 238, 0.262866, 0.951056, 0.162460 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 238, 239, 233, 232, 0.262866, 0.951056, 0.162460 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 240, 241, 243, 242, 0.262866, 0.951056, 0.162460 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 242, 243, 245, 244, 0.262866, 0.951056, 0.162460 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 244, 245, 247, 246, 0.525731, -0.000000, -0.850651 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 246, 247, 241, 240, 0.525731, -0.000000, -0.850651 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 248, 249, 251, 250, 0.000000, -0.850651, -0.525731 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 250, 251, 253, 252, 0.000000, -0.850651, -0.525731 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 252, 253, 255, 254, -0.951057, 0.162460, -0.262865 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 254, 255, 249, 248, -0.951057, 0.162460, -0.262865 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 256, 257, 259, 258, -0.951057, 0.162460, -0.262865 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 258, 259, 261, 260, -0.951057, 0.162460, -0.262865 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 260, 261, 263, 262, -0.000000, 0.850651, 0.525731 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 262, 263, 257, 256, -0.000000, 0.850651, 0.525731 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 264, 265, 267, 266, -0.000000, 0.850651, 0.525731 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 266, 267, 269, 268, -0.000000, 0.850651, 0.525731 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 268, 269, 271, 270, 0.951056, -0.162460, 0.262866 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 270, 271, 265, 264, 0.951056, -0.162460, 0.262866 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 272, 273, 275, 274, 0.951056, -0.162460, 0.262866 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 274, 275, 277, 276, 0.951056, -0.162460, 0.262866 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 276, 277, 279, 278, 0.000000, -0.850651, -0.525731 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 278, 279, 273, 272, 0.000000, -0.850651, -0.525731 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 280, 281, 283, 282, 0.000000, 0.000000, 1.000000 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 282, 283, 285, 284, 0.000000, 0.000000, 1.000000 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 284, 285, 287, 286, 0.000000, -1.000000, 0.000000 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 286, 287, 281, 280, 0.000000, -1.000000, 0.000000 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 288, 289, 291, 290, 0.000000, -1.000000, 0.000000 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 290, 291, 293, 292, 0.000000, -1.000000, 0.000000 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 292, 293, 295, 294, 0.000000, 0.000000, -1.000000 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 294, 295, 289, 288, 0.000000, 0.000000, -1.000000 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 296, 297, 299, 298, 0.000000, 0.000000, -1.000000 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 298, 299, 301, 300, 0.000000, 0.000000, -1.000000 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 300, 301, 303, 302, 0.000000, 1.000000, 0.000000 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 302, 303, 297, 296, 0.000000, 1.000000, 0.000000 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 304, 305, 307, 306, 0.000000, 1.000000, 0.000000 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 306, 307, 309, 308, 0.000000, 1.000000, 0.000000 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 308, 309, 311, 310, 0.000000, 0.000000, 1.000000 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 310, 311, 305, 304, 0.000000, 0.000000, 1.000000 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 312, 313, 315, 314, -0.000000, 0.356822, -0.934172 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 314, 315, 317, 316, -0.000000, 0.356822, -0.934172 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 316, 317, 319, 318, -0.866025, 0.467086, 0.178411 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 318, 319, 313, 312, -0.866025, 0.467086, 0.178411 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 320, 321, 323, 322, -0.866025, 0.467086, 0.178411 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 322, 323, 325, 324, -0.866025, 0.467086, 0.178411 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 324, 325, 327, 326, 0.000000, -0.356822, 0.934172 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 326, 327, 321, 320, 0.000000, -0.356822, 0.934172 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 328, 329, 331, 330, 0.000000, -0.356822, 0.934172 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 330, 331, 333, 332, 0.000000, -0.356822, 0.934172 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 332, 333, 335, 334, 0.866025, -0.467086, -0.178411 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 334, 335, 329, 328, 0.866025, -0.467086, -0.178411 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 336, 337, 339, 338, 0.866025, -0.467086, -0.178411 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 338, 339, 341, 340, 0.866025, -0.467086, -0.178411 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 340, 341, 343, 342, -0.000000, 0.356822, -0.934172 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 342, 343, 337, 336, -0.000000, 0.356822, -0.934172 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 344, 345, 347, 346, 0.000000, 0.000000, 1.000000 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 346, 347, 349, 348, 0.000000, 0.000000, 1.000000 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 348, 349, 351, 350, -1.000000, 0.000000, 0.000000 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 350, 351, 345, 344, -1.000000, 0.000000, 0.000000 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+	f4( 352, 353, 355, 354, -1.000000, 0.000000, 0.000000 );
+	uv( 0.000000, 1.000000, 0.000000, 0.000000, 0.250000, 0.000000, 0.250000, 1.000000);
+	f4( 354, 355, 357, 356, -1.000000, 0.000000, 0.000000 );
+	uv( 0.250000, 1.000000, 0.250000, 0.000000, 0.500000, 0.000000, 0.500000, 1.000000);
+	f4( 356, 357, 359, 358, 0.000000, 0.000000, -1.000000 );
+	uv( 0.500000, 1.000000, 0.500000, 0.000000, 0.750000, 0.000000, 0.750000, 1.000000);
+	f4( 358, 359, 353, 352, 0.000000, 0.000000, -1.000000 );
+	uv( 0.750000, 1.000000, 0.750000, 0.000000, 1.000000, 0.000000, 1.000000, 1.000000);
+
+	this.computeCentroids();
+	this.computeNormals(true);
+
+	scope.colors = {};
+	scope.selections = {};
+	scope.selections["edges"] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119];
+
+	scope.autoColor = function(){
+		for(var s in this.selections){
+			for(var i = 0 ; i < this.selections[s].length; i++) this.faces[this.selections[s][i]].material = [new THREE.MeshBasicMaterial({color:this.colors[s]})];
+		}
+	}
+
+	scope.getPosition = function(){	return new THREE.Vector3(0.0, 0.0, 0.0);	}
+
+	scope.getRotation = function(){	return new THREE.Vector3(0.0, 0.0, 0.0);	}
+
+	scope.getScale = function(){	return new THREE.Vector3(1.0, 1.0, 1.0);	}
 
 	function v( x, y, z ) {
 

BIN
utils/exporters/.DS_Store


File diff suppressed because it is too large
+ 0 - 1
utils/exporters/cinema4d/Three.js


+ 1 - 1
utils/exporters/cinema4d/export_to_three.js.py

@@ -111,7 +111,7 @@ def Export():
                     code += '\tuv( %.6f, %.6f, %.6f, %.6f, %.6f, %.6f);\n' % (uv[0].x, uv[0].y, uv[1].x, uv[1].y, uv[2].x, uv[2].y)
                 ncount += 1
                 uvcount += 1
-            
+        code +='\n\tthis.computeCentroids();\n\tthis.computeNormals(true);\n'
         #selection color
         code +='\n\tscope.colors = {};\n'
         code +='\tscope.selections = {};\n'

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