Merging with alteredq's branch.

examples/obj/female02/Female02_bin.js

@@ -8,6 +8,7 @@
 
 
 var model = {
+
     'version' : 1,
 
     'materials': [	{
@@ -97,6 +98,7 @@ var model = {
     'buffers': 'Female02_bin.bin',
 
     'end': (new Date).getTime()
-    }
+    
+};
     
 postMessage( model );

examples/obj/lucy/Lucy100k_bin.js

@@ -8,6 +8,7 @@
 
 
 var model = {
+
     'version' : 1,
 
     'materials': [	{
@@ -19,6 +20,7 @@ var model = {
     'buffers': 'Lucy100k_bin.bin',
 
     'end': (new Date).getTime()
-    }
+    
+};
     
 postMessage( model );

examples/obj/male02/Male02_bin.js

@@ -8,6 +8,7 @@
 
 
 var model = {
+
     'version' : 1,
 
     'materials': [	{
@@ -83,6 +84,7 @@ var model = {
     'buffers': 'Male02_bin.bin',
 
     'end': (new Date).getTime()
-    }
+    
+};
     
 postMessage( model );

examples/obj/ninja/NinjaLo_bin.js

@@ -8,6 +8,7 @@
 
 
 var model = {
+
     'version' : 1,
 
     'materials': [	{
@@ -19,6 +20,7 @@ var model = {
     'buffers': 'NinjaLo_bin.bin',
 
     'end': (new Date).getTime()
-    }
+    
+};
     
 postMessage( model );

examples/obj/torus/Torus_bin.js

@@ -8,6 +8,7 @@
 
 
 var model = {
+
     'version' : 1,
 
     'materials': [	{
@@ -19,6 +20,7 @@ var model = {
     'buffers': 'Torus_bin.bin',
 
     'end': (new Date).getTime()
-    }
+    
+};
     
 postMessage( model );

examples/obj/torus/Torus_slim.js

@@ -10,6 +10,7 @@
 
 
 var model = {
+
     'version' : 2,
     
     'materials': [	{
@@ -29,6 +30,7 @@ var model = {
     'faces': [35,0,12,13,1,0,0,1,2,3,35,1,13,14,2,0,3,2,4,5,35,2,14,15,3,0,5,4,6,6,35,3,15,16,4,0,6,6,7,8,35,4,16,17,5,0,8,7,9,10,35,5,17,18,6,0,10,9,11,12,35,6,18,19,7,0,12,11,13,14,35,7,19,20,8,0,14,13,15,16,35,8,20,21,9,0,16,15,17,17,35,9,21,22,10,0,17,17,18,19,35,10,22,23,11,0,19,18,20,21,35,0,11,23,12,0,0,21,20,1,35,12,24,25,13,0,1,22,23,2,35,13,25,26,14,0,2,23,24,4,35,14,26,27,15,0,4,24,6,6,35,15,27,28,16,0,6,6,25,7,35,16,28,29,17,0,7,25,26,9,35,17,29,30,18,0,9,26,27,11,35,18,30,31,19,0,11,27,28,13,35,19,31,32,20,0,13,28,29,15,35,20,32,33,21,0,15,29,17,17,35,21,33,34,22,0,17,17,30,18,35,22,34,35,23,0,18,30,31,20,35,23,35,24,12,0,20,31,22,1,35,24,36,37,25,0,22,32,33,23,35,25,37,38,26,0,23,33,34,24,35,26,38,39,27,0,24,34,6,6,35,27,39,40,28,0,6,6,35,25,35,28,40,41,29,0,25,35,36,26,35,29,41,42,30,0,26,36,37,27,35,30,42,43,31,0,27,37,38,28,35,31,43,44,32,0,28,38,39,29,35,32,44,45,33,0,29,39,17,17,35,33,45,46,34,0,17,17,40,30,35,34,46,47,35,0,30,40,41,31,35,35,47,36,24,0,31,41,32,22,35,36,48,49,37,0,32,42,43,33,35,37,49,50,38,0,33,43,44,34,35,38,50,51,39,0,34,44,6,6,35,39,51,52,40,0,6,6,45,35,35,40,52,53,41,0,35,45,46,36,35,41,53,54,42,0,36,46,47,37,35,42,54,55,43,0,37,47,48,38,35,43,55,56,44,0,38,48,49,39,35,44,56,57,45,0,39,49,17,17,35,45,57,58,46,0,17,17,50,40,35,46,58,59,47,0,40,50,51,41,35,47,59,48,36,0,41,51,42,32,35,48,60,61,49,0,42,52,53,43,35,49,61,62,50,0,43,53,54,44,35,50,62,63,51,0,44,54,6,6,35,51,63,64,52,0,6,6,55,45,35,52,64,65,53,0,45,55,56,46,35,53,65,66,54,0,46,56,57,47,35,54,66,67,55,0,47,57,58,48,35,55,67,68,56,0,48,58,59,49,35,56,68,69,57,0,49,59,17,17,35,57,69,70,58,0,17,17,60,50,35,58,70,71,59,0,50,60,61,51,35,59,71,60,48,0,51,61,52,42,35,60,72,73,61,0,52,62,63,53,35,61,73,74,62,0,53,63,64,54,35,62,74,75,63,0,54,64,6,6,35,63,75,76,64,0,6,6,65,55,35,64,76,77,65,0,55,65,66,56,35,65,77,78,66,0,56,66,67,57,35,66,78,79,67,0,57,67,68,58,35,67,79,80,68,0,58,68,69,59,35,68,80,81,69,0,59,69,17,17,35,69,81,82,70,0,17,17,70,60,35,70,82,83,71,0,60,70,71,61,35,71,83,72,60,0,61,71,62,52,35,72,84,85,73,0,62,72,73,63,35,73,85,86,74,0,63,73,74,64,35,74,86,87,75,0,64,74,6,6,35,75,87,88,76,0,6,6,75,65,35,76,88,89,77,0,65,75,76,66,35,77,89,90,78,0,66,76,77,67,35,78,90,91,79,0,67,77,78,68,35,79,91,92,80,0,68,78,79,69,35,80,92,93,81,0,69,79,17,17,35,81,93,94,82,0,17,17,80,70,35,82,94,95,83,0,70,80,81,71,35,83,95,84,72,0,71,81,72,62,35,84,96,97,85,0,72,82,83,73,35,85,97,98,86,0,73,83,84,74,35,86,98,99,87,0,74,84,6,6,35,87,99,100,88,0,6,6,85,75,35,88,100,101,89,0,75,85,86,76,35,89,101,102,90,0,76,86,87,77,35,90,102,103,91,0,77,87,88,78,35,91,103,104,92,0,78,88,89,79,35,92,104,105,93,0,79,89,17,17,35,93,105,106,94,0,17,17,90,80,35,94,106,107,95,0,80,90,91,81,35,95,107,96,84,0,81,91,82,72,35,96,108,109,97,0,82,92,93,83,35,97,109,110,98,0,83,93,94,84,35,98,110,111,99,0,84,94,6,6,35,99,111,112,100,0,6,6,95,85,35,100,112,113,101,0,85,95,96,86,35,101,113,114,102,0,86,96,97,87,35,102,114,115,103,0,87,97,98,88,35,103,115,116,104,0,88,98,99,89,35,104,116,117,105,0,89,99,17,17,35,105,117,118,106,0,17,17,100,90,35,106,118,119,107,0,90,100,101,91,35,107,119,108,96,0,91,101,92,82,35,108,120,121,109,0,92,102,103,93,35,109,121,122,110,0,93,103,104,94,35,110,122,123,111,0,94,104,6,6,35,111,123,124,112,0,6,6,105,95,35,112,124,125,113,0,95,105,106,96,35,113,125,126,114,0,96,106,107,97,35,114,126,127,115,0,97,107,108,98,35,115,127,128,116,0,98,108,109,99,35,116,128,129,117,0,99,109,17,17,35,117,129,130,118,0,17,17,110,100,35,118,130,131,119,0,100,110,111,101,35,119,131,120,108,0,101,111,102,92,35,120,132,133,121,0,102,112,113,103,35,121,133,134,122,0,103,113,114,104,35,122,134,135,123,0,104,114,6,6,35,123,135,136,124,0,6,6,115,105,35,124,136,137,125,0,105,115,116,106,35,125,137,138,126,0,106,116,117,107,35,126,138,139,127,0,107,117,118,108,35,127,139,140,128,0,108,118,119,109,35,128,140,141,129,0,109,119,17,17,35,129,141,142,130,0,17,17,120,110,35,130,142,143,131,0,110,120,121,111,35,131,143,132,120,0,111,121,112,102,35,132,144,145,133,0,112,122,123,113,35,133,145,146,134,0,113,123,124,114,35,134,146,147,135,0,114,124,6,6,35,135,147,148,136,0,6,6,125,115,35,136,148,149,137,0,115,125,126,116,35,137,149,150,138,0,116,126,127,117,35,138,150,151,139,0,117,127,128,118,35,139,151,152,140,0,118,128,129,119,35,140,152,153,141,0,119,129,17,17,35,141,153,154,142,0,17,17,130,120,35,142,154,155,143,0,120,130,131,121,35,143,155,144,132,0,121,131,122,112,35,144,156,157,145,0,122,132,133,123,35,145,157,158,146,0,123,133,134,124,35,146,158,159,147,0,124,134,6,6,35,147,159,160,148,0,6,6,135,125,35,148,160,161,149,0,125,135,136,126,35,149,161,162,150,0,126,136,137,127,35,150,162,163,151,0,127,137,138,128,35,151,163,164,152,0,128,138,139,129,35,152,164,165,153,0,129,139,17,17,35,153,165,166,154,0,17,17,140,130,35,154,166,167,155,0,130,140,141,131,35,155,167,156,144,0,131,141,132,122,35,156,168,169,157,0,132,142,143,133,35,157,169,170,158,0,133,143,144,134,35,158,170,171,159,0,134,144,6,6,35,159,171,172,160,0,6,6,145,135,35,160,172,173,161,0,135,145,146,136,35,161,173,174,162,0,136,146,147,137,35,162,174,175,163,0,137,147,148,138,35,163,175,176,164,0,138,148,149,139,35,164,176,177,165,0,139,149,17,17,35,165,177,178,166,0,17,17,150,140,35,166,178,179,167,0,140,150,151,141,35,167,179,168,156,0,141,151,142,132,35,168,180,181,169,0,142,152,153,143,35,169,181,182,170,0,143,153,154,144,35,170,182,183,171,0,144,154,6,6,35,171,183,184,172,0,6,6,155,145,35,172,184,185,173,0,145,155,156,146,35,173,185,186,174,0,146,156,157,147,35,174,186,187,175,0,147,157,158,148,35,175,187,188,176,0,148,158,159,149,35,176,188,189,177,0,149,159,17,17,35,177,189,190,178,0,17,17,160,150,35,178,190,191,179,0,150,160,161,151,35,179,191,180,168,0,151,161,152,142,35,180,192,193,181,0,152,162,163,153,35,181,193,194,182,0,153,163,164,154,35,182,194,195,183,0,154,164,6,6,35,183,195,196,184,0,6,6,165,155,35,184,196,197,185,0,155,165,166,156,35,185,197,198,186,0,156,166,167,157,35,186,198,199,187,0,157,167,168,158,35,187,199,200,188,0,158,168,169,159,35,188,200,201,189,0,159,169,17,17,35,189,201,202,190,0,17,17,170,160,35,190,202,203,191,0,160,170,171,161,35,191,203,192,180,0,161,171,162,152,35,192,204,205,193,0,162,172,173,163,35,193,205,206,194,0,163,173,174,164,35,194,206,207,195,0,164,174,6,6,35,195,207,208,196,0,6,6,175,165,35,196,208,209,197,0,165,175,176,166,35,197,209,210,198,0,166,176,177,167,35,198,210,211,199,0,167,177,178,168,35,199,211,212,200,0,168,178,179,169,35,200,212,213,201,0,169,179,17,17,35,201,213,214,202,0,17,17,180,170,35,202,214,215,203,0,170,180,181,171,35,203,215,204,192,0,171,181,172,162,35,204,216,217,205,0,172,182,183,173,35,205,217,218,206,0,173,183,184,174,35,206,218,219,207,0,174,184,6,6,35,207,219,220,208,0,6,6,185,175,35,208,220,221,209,0,175,185,186,176,35,209,221,222,210,0,176,186,187,177,35,210,222,223,211,0,177,187,188,178,35,211,223,224,212,0,178,188,189,179,35,212,224,225,213,0,179,189,17,17,35,213,225,226,214,0,17,17,190,180,35,214,226,227,215,0,180,190,191,181,35,215,227,216,204,0,181,191,182,172,35,216,228,229,217,0,182,192,193,183,35,217,229,230,218,0,183,193,194,184,35,218,230,231,219,0,184,194,6,6,35,219,231,232,220,0,6,6,195,185,35,220,232,233,221,0,185,195,196,186,35,221,233,234,222,0,186,196,197,187,35,222,234,235,223,0,187,197,198,188,35,223,235,236,224,0,188,198,199,189,35,224,236,237,225,0,189,199,17,17,35,225,237,238,226,0,17,17,200,190,35,226,238,239,227,0,190,200,201,191,35,227,239,228,216,0,191,201,192,182,35,228,240,241,229,0,192,202,203,193,35,229,241,242,230,0,193,203,204,194,35,230,242,243,231,0,194,204,6,6,35,231,243,244,232,0,6,6,205,195,35,232,244,245,233,0,195,205,206,196,35,233,245,246,234,0,196,206,207,197,35,234,246,247,235,0,197,207,208,198,35,235,247,248,236,0,198,208,209,199,35,236,248,249,237,0,199,209,17,17,35,237,249,250,238,0,17,17,210,200,35,238,250,251,239,0,200,210,211,201,35,239,251,240,228,0,201,211,202,192,35,240,252,253,241,0,202,212,213,203,35,241,253,254,242,0,203,213,214,204,35,242,254,255,243,0,204,214,6,6,35,243,255,256,244,0,6,6,215,205,35,244,256,257,245,0,205,215,216,206,35,245,257,258,246,0,206,216,217,207,35,246,258,259,247,0,207,217,218,208,35,247,259,260,248,0,208,218,219,209,35,248,260,261,249,0,209,219,17,17,35,249,261,262,250,0,17,17,220,210,35,250,262,263,251,0,210,220,221,211,35,251,263,252,240,0,211,221,212,202,35,252,264,265,253,0,212,222,223,213,35,253,265,266,254,0,213,223,224,214,35,254,266,267,255,0,214,224,6,6,35,255,267,268,256,0,6,6,225,215,35,256,268,269,257,0,215,225,226,216,35,257,269,270,258,0,216,226,227,217,35,258,270,271,259,0,217,227,228,218,35,259,271,272,260,0,218,228,229,219,35,260,272,273,261,0,219,229,17,17,35,261,273,274,262,0,17,17,230,220,35,262,274,275,263,0,220,230,231,221,35,263,275,264,252,0,221,231,222,212,35,264,276,277,265,0,222,232,233,223,35,265,277,278,266,0,223,233,234,224,35,266,278,279,267,0,224,234,6,6,35,267,279,280,268,0,6,6,235,225,35,268,280,281,269,0,225,235,236,226,35,269,281,282,270,0,226,236,237,227,35,270,282,283,271,0,227,237,238,228,35,271,283,284,272,0,228,238,239,229,35,272,284,285,273,0,229,239,17,17,35,273,285,286,274,0,17,17,240,230,35,274,286,287,275,0,230,240,241,231,35,275,287,276,264,0,231,241,232,222,35,276,288,289,277,0,232,242,10,233,35,277,289,290,278,0,233,10,8,234,35,278,290,291,279,0,234,8,6,6,35,279,291,292,280,0,6,6,5,235,35,280,292,293,281,0,235,5,3,236,35,281,293,294,282,0,236,3,0,237,35,282,294,295,283,0,237,0,21,238,35,283,295,296,284,0,238,21,19,239,35,284,296,297,285,0,239,19,17,17,35,285,297,298,286,0,17,17,16,240,35,286,298,299,287,0,240,16,14,241,35,287,299,288,276,0,241,14,242,232,35,288,300,301,289,0,242,11,9,10,35,289,301,302,290,0,10,9,7,8,35,290,302,303,291,0,8,7,6,6,35,291,303,304,292,0,6,6,4,5,35,292,304,305,293,0,5,4,2,3,35,293,305,306,294,0,3,2,1,0,35,294,306,307,295,0,0,1,20,21,35,295,307,308,296,0,21,20,18,19,35,296,308,309,297,0,19,18,17,17,35,297,309,310,298,0,17,17,15,16,35,298,310,311,299,0,16,15,13,14,35,299,311,300,288,0,14,13,11,242,35,300,312,313,301,0,11,27,243,9,35,301,313,314,302,0,9,243,25,7,35,302,314,315,303,0,7,25,6,6,35,303,315,316,304,0,6,6,24,4,35,304,316,317,305,0,4,24,23,2,35,305,317,318,306,0,2,23,22,1,35,306,318,319,307,0,1,22,31,20,35,307,319,320,308,0,20,31,30,18,35,308,320,321,309,0,18,30,17,17,35,309,321,322,310,0,17,17,29,15,35,310,322,323,311,0,15,29,28,13,35,311,323,312,300,0,13,28,27,11,35,312,324,325,313,0,27,37,36,243,35,313,325,326,314,0,243,36,35,25,35,314,326,327,315,0,25,35,6,6,35,315,327,328,316,0,6,6,34,24,35,316,328,329,317,0,24,34,33,23,35,317,329,330,318,0,23,33,32,22,35,318,330,331,319,0,22,32,41,31,35,319,331,332,320,0,31,41,40,30,35,320,332,333,321,0,30,40,17,17,35,321,333,334,322,0,17,17,39,29,35,322,334,335,323,0,29,39,38,28,35,323,335,324,312,0,28,38,37,27,35,324,336,337,325,0,37,47,46,36,35,325,337,338,326,0,36,46,45,35,35,326,338,339,327,0,35,45,6,6,35,327,339,340,328,0,6,6,44,34,35,328,340,341,329,0,34,44,43,33,35,329,341,342,330,0,33,43,42,32,35,330,342,343,331,0,32,42,51,41,35,331,343,344,332,0,41,51,50,40,35,332,344,345,333,0,40,50,17,17,35,333,345,346,334,0,17,17,49,39,35,334,346,347,335,0,39,49,48,38,35,335,347,336,324,0,38,48,47,37,35,336,348,349,337,0,47,57,56,46,35,337,349,350,338,0,46,56,55,45,35,338,350,351,339,0,45,55,6,6,35,339,351,352,340,0,6,6,54,44,35,340,352,353,341,0,44,54,53,43,35,341,353,354,342,0,43,53,52,42,35,342,354,355,343,0,42,52,61,51,35,343,355,356,344,0,51,61,60,50,35,344,356,357,345,0,50,60,17,17,35,345,357,358,346,0,17,17,59,49,35,346,358,359,347,0,49,59,58,48,35,347,359,348,336,0,48,58,57,47,35,348,360,361,349,0,57,67,66,56,35,349,361,362,350,0,56,66,65,55,35,350,362,363,351,0,55,65,6,6,35,351,363,364,352,0,6,6,64,54,35,352,364,365,353,0,54,64,63,53,35,353,365,366,354,0,53,63,62,52,35,354,366,367,355,0,52,62,71,61,35,355,367,368,356,0,61,71,70,60,35,356,368,369,357,0,60,70,17,17,35,357,369,370,358,0,17,17,69,59,35,358,370,371,359,0,59,69,68,58,35,359,371,360,348,0,58,68,67,57,35,360,372,373,361,0,67,77,76,66,35,361,373,374,362,0,66,76,75,65,35,362,374,375,363,0,65,75,6,6,35,363,375,376,364,0,6,6,74,64,35,364,376,377,365,0,64,74,73,63,35,365,377,378,366,0,63,73,72,62,35,366,378,379,367,0,62,72,81,71,35,367,379,380,368,0,71,81,80,70,35,368,380,381,369,0,70,80,17,17,35,369,381,382,370,0,17,17,79,69,35,370,382,383,371,0,69,79,78,68,35,371,383,372,360,0,68,78,77,67,35,372,384,385,373,0,77,87,86,76,35,373,385,386,374,0,76,86,85,75,35,374,386,387,375,0,75,85,6,6,35,375,387,388,376,0,6,6,84,74,35,376,388,389,377,0,74,84,83,73,35,377,389,390,378,0,73,83,82,72,35,378,390,391,379,0,72,82,91,81,35,379,391,392,380,0,81,91,90,80,35,380,392,393,381,0,80,90,17,17,35,381,393,394,382,0,17,17,89,79,35,382,394,395,383,0,79,89,88,78,35,383,395,384,372,0,78,88,87,77,35,384,396,397,385,0,87,97,96,86,35,385,397,398,386,0,86,96,95,85,35,386,398,399,387,0,85,95,6,6,35,387,399,400,388,0,6,6,94,84,35,388,400,401,389,0,84,94,93,83,35,389,401,402,390,0,83,93,92,82,35,390,402,403,391,0,82,92,101,91,35,391,403,404,392,0,91,101,100,90,35,392,404,405,393,0,90,100,17,17,35,393,405,406,394,0,17,17,99,89,35,394,406,407,395,0,89,99,98,88,35,395,407,396,384,0,88,98,97,87,35,396,408,409,397,0,97,107,106,96,35,397,409,410,398,0,96,106,105,95,35,398,410,411,399,0,95,105,6,6,35,399,411,412,400,0,6,6,104,94,35,400,412,413,401,0,94,104,103,93,35,401,413,414,402,0,93,103,102,92,35,402,414,415,403,0,92,102,111,101,35,403,415,416,404,0,101,111,110,100,35,404,416,417,405,0,100,110,17,17,35,405,417,418,406,0,17,17,109,99,35,406,418,419,407,0,99,109,244,98,35,407,419,408,396,0,98,244,107,97,35,408,420,421,409,0,107,117,116,106,35,409,421,422,410,0,106,116,115,105,35,410,422,423,411,0,105,115,6,6,35,411,423,424,412,0,6,6,114,104,35,412,424,425,413,0,104,114,113,103,35,413,425,426,414,0,103,113,112,102,35,414,426,427,415,0,102,112,121,111,35,415,427,428,416,0,111,121,120,110,35,416,428,429,417,0,110,120,17,17,35,417,429,430,418,0,17,17,119,109,35,418,430,431,419,0,109,119,118,244,35,419,431,420,408,0,244,118,117,107,35,420,432,433,421,0,117,127,126,116,35,421,433,434,422,0,116,126,125,115,35,422,434,435,423,0,115,125,6,6,35,423,435,436,424,0,6,6,124,114,35,424,436,437,425,0,114,124,123,113,35,425,437,438,426,0,113,123,245,112,35,426,438,439,427,0,112,245,131,121,35,427,439,440,428,0,121,131,130,120,35,428,440,441,429,0,120,130,17,17,35,429,441,442,430,0,17,17,129,119,35,430,442,443,431,0,119,129,128,118,35,431,443,432,420,0,118,128,127,117,35,432,444,445,433,0,127,137,136,126,35,433,445,446,434,0,126,136,135,125,35,434,446,447,435,0,125,135,6,6,35,435,447,448,436,0,6,6,134,124,35,436,448,449,437,0,124,134,133,123,35,437,449,450,438,0,123,133,132,245,35,438,450,451,439,0,245,132,141,131,35,439,451,452,440,0,131,141,140,130,35,440,452,453,441,0,130,140,17,17,35,441,453,454,442,0,17,17,139,129,35,442,454,455,443,0,129,139,138,128,35,443,455,444,432,0,128,138,137,127,35,444,456,457,445,0,137,147,146,136,35,445,457,458,446,0,136,146,145,135,35,446,458,459,447,0,135,145,6,6,35,447,459,460,448,0,6,6,144,134,35,448,460,461,449,0,134,144,143,133,35,449,461,462,450,0,133,143,142,132,35,450,462,463,451,0,132,142,151,141,35,451,463,464,452,0,141,151,150,140,35,452,464,465,453,0,140,150,17,17,35,453,465,466,454,0,17,17,149,139,35,454,466,467,455,0,139,149,148,138,35,455,467,456,444,0,138,148,147,137,35,456,468,469,457,0,147,157,156,146,35,457,469,470,458,0,146,156,155,145,35,458,470,471,459,0,145,155,6,6,35,459,471,472,460,0,6,6,154,144,35,460,472,473,461,0,144,154,153,143,35,461,473,474,462,0,143,153,152,142,35,462,474,475,463,0,142,152,161,151,35,463,475,476,464,0,151,161,160,150,35,464,476,477,465,0,150,160,17,17,35,465,477,478,466,0,17,17,159,149,35,466,478,479,467,0,149,159,158,148,35,467,479,468,456,0,148,158,157,147,35,468,480,481,469,0,157,167,166,156,35,469,481,482,470,0,156,166,165,155,35,470,482,483,471,0,155,165,6,6,35,471,483,484,472,0,6,6,164,154,35,472,484,485,473,0,154,164,163,153,35,473,485,486,474,0,153,163,162,152,35,474,486,487,475,0,152,162,171,161,35,475,487,488,476,0,161,171,170,160,35,476,488,489,477,0,160,170,17,17,35,477,489,490,478,0,17,17,169,159,35,478,490,491,479,0,159,169,168,158,35,479,491,480,468,0,158,168,167,157,35,480,492,493,481,0,167,177,176,166,35,481,493,494,482,0,166,176,175,165,35,482,494,495,483,0,165,175,6,6,35,483,495,496,484,0,6,6,174,164,35,484,496,497,485,0,164,174,173,163,35,485,497,498,486,0,163,173,172,162,35,486,498,499,487,0,162,172,181,171,35,487,499,500,488,0,171,181,180,170,35,488,500,501,489,0,170,180,17,17,35,489,501,502,490,0,17,17,179,169,35,490,502,503,491,0,169,179,178,168,35,491,503,492,480,0,168,178,177,167,35,492,504,505,493,0,177,187,186,176,35,493,505,506,494,0,176,186,185,175,35,494,506,507,495,0,175,185,6,6,35,495,507,508,496,0,6,6,184,174,35,496,508,509,497,0,174,184,183,173,35,497,509,510,498,0,173,183,182,172,35,498,510,511,499,0,172,182,191,181,35,499,511,512,500,0,181,191,190,180,35,500,512,513,501,0,180,190,17,17,35,501,513,514,502,0,17,17,189,179,35,502,514,515,503,0,179,189,188,178,35,503,515,504,492,0,178,188,187,177,35,504,516,517,505,0,187,197,196,186,35,505,517,518,506,0,186,196,195,185,35,506,518,519,507,0,185,195,6,6,35,507,519,520,508,0,6,6,194,184,35,508,520,521,509,0,184,194,193,183,35,509,521,522,510,0,183,193,192,182,35,510,522,523,511,0,182,192,201,191,35,511,523,524,512,0,191,201,200,190,35,512,524,525,513,0,190,200,17,17,35,513,525,526,514,0,17,17,199,189,35,514,526,527,515,0,189,199,198,188,35,515,527,516,504,0,188,198,197,187,35,516,528,529,517,0,197,207,206,196,35,517,529,530,518,0,196,206,205,195,35,518,530,531,519,0,195,205,6,6,35,519,531,532,520,0,6,6,204,194,35,520,532,533,521,0,194,204,203,193,35,521,533,534,522,0,193,203,202,192,35,522,534,535,523,0,192,202,211,201,35,523,535,536,524,0,201,211,210,200,35,524,536,537,525,0,200,210,17,17,35,525,537,538,526,0,17,17,209,199,35,526,538,539,527,0,199,209,208,198,35,527,539,528,516,0,198,208,207,197,35,528,540,541,529,0,207,217,216,206,35,529,541,542,530,0,206,216,215,205,35,530,542,543,531,0,205,215,6,6,35,531,543,544,532,0,6,6,214,204,35,532,544,545,533,0,204,214,213,203,35,533,545,546,534,0,203,213,212,202,35,534,546,547,535,0,202,212,221,211,35,535,547,548,536,0,211,221,220,210,35,536,548,549,537,0,210,220,17,17,35,537,549,550,538,0,17,17,219,209,35,538,550,551,539,0,209,219,218,208,35,539,551,540,528,0,208,218,217,207,35,540,552,553,541,0,217,227,226,216,35,541,553,554,542,0,216,226,225,215,35,542,554,555,543,0,215,225,6,6,35,543,555,556,544,0,6,6,224,214,35,544,556,557,545,0,214,224,246,213,35,545,557,558,546,0,213,246,222,212,35,546,558,559,547,0,212,222,231,221,35,547,559,560,548,0,221,231,230,220,35,548,560,561,549,0,220,230,17,17,35,549,561,562,550,0,17,17,229,219,35,550,562,563,551,0,219,229,228,218,35,551,563,552,540,0,218,228,227,217,35,552,564,565,553,0,227,237,236,226,35,553,565,566,554,0,226,236,235,225,35,554,566,567,555,0,225,235,6,6,35,555,567,568,556,0,6,6,234,224,35,556,568,569,557,0,224,234,233,246,35,557,569,570,558,0,246,233,232,222,35,558,570,571,559,0,222,232,241,231,35,559,571,572,560,0,231,241,240,230,35,560,572,573,561,0,230,240,17,17,35,561,573,574,562,0,17,17,239,229,35,562,574,575,563,0,229,239,238,228,35,563,575,564,552,0,228,238,237,227,35,564,0,1,565,0,237,0,3,236,35,565,1,2,566,0,236,3,5,235,35,566,2,3,567,0,235,5,6,6,35,567,3,4,568,0,6,6,8,234,35,568,4,5,569,0,234,8,10,233,35,569,5,6,570,0,233,10,12,232,35,570,6,7,571,0,232,12,14,241,35,571,7,8,572,0,241,14,16,240,35,572,8,9,573,0,240,16,17,17,35,573,9,10,574,0,17,17,19,239,35,574,10,11,575,0,239,19,21,238,35,575,11,0,564,0,238,21,0,237],
 
     'end': (new Date).getTime()
-    }
+    
+};
     
 postMessage( model );

examples/obj/walt/WaltHead_bin.js

@@ -8,6 +8,7 @@
 
 
 var model = {
+
     'version' : 1,
 
     'materials': [	{
@@ -26,6 +27,7 @@ var model = {
     'buffers': 'WaltHead_bin.bin',
 
     'end': (new Date).getTime()
-    }
+    
+};
     
 postMessage( model );

examples/webgl_geometry_large_mesh.html

@@ -44,8 +44,92 @@
 
 		<pre id="log"></pre>
 
+<!--
 		<script type="text/javascript" src="../build/Three.js"></script>
-
+-->
+		<script type="text/javascript" src="../src/Three.js"></script>
+		<script type="text/javascript" src="../src/core/Color.js"></script>
+		<script type="text/javascript" src="../src/core/Vector2.js"></script>
+		<script type="text/javascript" src="../src/core/Vector3.js"></script>
+		<script type="text/javascript" src="../src/core/Vector4.js"></script>
+		<script type="text/javascript" src="../src/core/Ray.js"></script>
+		<script type="text/javascript" src="../src/core/Rectangle.js"></script>
+		<script type="text/javascript" src="../src/core/Matrix3.js"></script>
+		<script type="text/javascript" src="../src/core/Matrix4.js"></script>
+		<script type="text/javascript" src="../src/core/Object3D.js"></script>
+		<script type="text/javascript" src="../src/core/Quaternion.js"></script>
+		<script type="text/javascript" src="../src/core/Vertex.js"></script>
+		<script type="text/javascript" src="../src/core/Face3.js"></script>
+		<script type="text/javascript" src="../src/core/Face4.js"></script>
+		<script type="text/javascript" src="../src/core/UV.js"></script>
+		<script type="text/javascript" src="../src/core/Geometry.js"></script>
+		<script type="text/javascript" src="../src/core/Spline.js"></script>
+		<script type="text/javascript" src="../src/animation/AnimationHandler.js"></script>
+		<script type="text/javascript" src="../src/animation/Animation.js"></script>
+		<script type="text/javascript" src="../src/cameras/Camera.js"></script>
+		<script type="text/javascript" src="../src/lights/Light.js"></script>
+		<script type="text/javascript" src="../src/lights/AmbientLight.js"></script>
+		<script type="text/javascript" src="../src/lights/DirectionalLight.js"></script>
+		<script type="text/javascript" src="../src/lights/PointLight.js"></script>
+		<script type="text/javascript" src="../src/materials/Material.js"></script>
+		<script type="text/javascript" src="../src/materials/Mappings.js"></script>
+		<script type="text/javascript" src="../src/materials/LineBasicMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshBasicMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshLambertMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshPhongMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshDepthMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshNormalMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshFaceMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshShaderMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/ParticleBasicMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/ParticleCircleMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/ParticleDOMMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/Texture.js"></script>
+		<script type="text/javascript" src="../src/materials/RenderTarget.js"></script>
+		<script type="text/javascript" src="../src/materials/Uniforms.js"></script>
+		<script type="text/javascript" src="../src/objects/Particle.js"></script>
+		<script type="text/javascript" src="../src/objects/ParticleSystem.js"></script>
+		<script type="text/javascript" src="../src/objects/Line.js"></script>
+		<script type="text/javascript" src="../src/objects/Mesh.js"></script>
+		<script type="text/javascript" src="../src/objects/Bone.js"></script>
+		<script type="text/javascript" src="../src/objects/SkinnedMesh.js"></script>
+		<script type="text/javascript" src="../src/objects/Ribbon.js"></script>
+		<script type="text/javascript" src="../src/objects/Sound.js"></script>
+		<script type="text/javascript" src="../src/objects/LOD.js"></script>
+		<script type="text/javascript" src="../src/scenes/Scene.js"></script>
+		<script type="text/javascript" src="../src/scenes/Fog.js"></script>
+		<script type="text/javascript" src="../src/scenes/FogExp2.js"></script>
+		<script type="text/javascript" src="../src/renderers/Projector.js"></script>
+		<script type="text/javascript" src="../src/renderers/DOMRenderer.js"></script>
+		<script type="text/javascript" src="../src/renderers/CanvasRenderer.js"></script>
+		<script type="text/javascript" src="../src/renderers/SVGRenderer.js"></script>
+		<script type="text/javascript" src="../src/renderers/WebGLShaders.js"></script>
+		<script type="text/javascript" src="../src/renderers/WebGLRenderer.js"></script>
+		<script type="text/javascript" src="../src/renderers/SoundRenderer.js"></script>
+		<script type="text/javascript" src="../src/renderers/renderables/RenderableVertex.js"></script>
+		<script type="text/javascript" src="../src/renderers/renderables/RenderableFace3.js"></script>
+		<script type="text/javascript" src="../src/renderers/renderables/RenderableObject.js"></script>
+		<script type="text/javascript" src="../src/renderers/renderables/RenderableParticle.js"></script>
+		<script type="text/javascript" src="../src/renderers/renderables/RenderableLine.js"></script>
+		<script type="text/javascript" src="../src/extras/GeometryUtils.js"></script>
+		<script type="text/javascript" src="../src/extras/ImageUtils.js"></script>
+		<script type="text/javascript" src="../src/extras/SceneUtils.js"></script>
+		<script type="text/javascript" src="../src/extras/ShaderUtils.js"></script>
+		<script type="text/javascript" src="../src/extras/cameras/QuakeCamera.js"></script>
+		<script type="text/javascript" src="../src/extras/cameras/PathCamera.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Cube.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Cylinder.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Icosahedron.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Lathe.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Plane.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Sphere.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Torus.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/TorusKnot.js"></script>
+		<script type="text/javascript" src="../src/extras/io/Loader.js"></script>
+		<script type="text/javascript" src="../src/extras/io/JSONLoader.js"></script>
+		<script type="text/javascript" src="../src/extras/io/BinaryLoader.js"></script>
+		<script type="text/javascript" src="../src/extras/objects/MarchingCubes.js"></script>
+		
 		<script type="text/javascript" src="js/RequestAnimationFrame.js"></script>
 		<script type="text/javascript" src="js/Stats.js"></script>
 
@@ -77,10 +161,10 @@
 			var render_canvas = 1, render_gl = 1;
 			var has_gl = 0;
 
-			var bcanvas = document.getElementById("rcanvas");
-			var bwebgl = document.getElementById("rwebgl");
+			var bcanvas = document.getElementById( "rcanvas" );
+			var bwebgl = document.getElementById( "rwebgl" );
 
-			document.addEventListener('mousemove', onDocumentMouseMove, false);
+			document.addEventListener( 'mousemove', onDocumentMouseMove, false );
 
 			init();
 			animate();
@@ -107,8 +191,8 @@
 
 			function init() {
 
-				container = document.createElement('div');
-				document.body.appendChild(container);
+				container = document.createElement( 'div' );
+				document.body.appendChild( container );
 
 				camera = new THREE.Camera( 50, SCREEN_WIDTH / SCREEN_HEIGHT, 1, 100000 );
 				camera.position.z = 1500;
@@ -141,7 +225,7 @@
 				lightMesh.position = pointLight.position;
 				lightMesh.overdraw = true;
 				lightMesh.updateMatrix();
-				scene.addObject(lightMesh);
+				scene.addObject( lightMesh );
 
 
 				if ( render_gl ) {
@@ -169,17 +253,18 @@
 				stats.domElement.style.zIndex = 100;
 				container.appendChild( stats.domElement );
 
-				bcanvas.addEventListener("click", toggleCanvas, false);
-				bwebgl.addEventListener("click", toggleWebGL, false);
+				bcanvas.addEventListener( "click", toggleCanvas, false );
+				bwebgl.addEventListener( "click", toggleWebGL, false );
 
-				loader = new THREE.Loader( true );
+				//loader = new THREE.BinaryLoader( true );
+				loader = new THREE.JSONLoader( true );
 				document.body.appendChild( loader.statusDomElement );
 
 				var s = (new Date).getTime(),
 					callback = function( geometry ) { createScene( geometry, s ) };
 
-				//loader.loadAscii( { model: 'obj/lucy/Lucy100k_slim.js', callback: callback } );
-				loader.loadBinary( { model: 'obj/lucy/Lucy100k_bin.js', callback: callback } );
+				loader.load( { model: 'obj/lucy/Lucy100k_slim.js', callback: callback } );
+				//loader.load( { model: 'obj/lucy/Lucy100k_bin.js', callback: callback } );
 
 			}
 

examples/webgl_objconvert_test.html

@@ -42,8 +42,91 @@
 
 		<pre id="log"></pre>
 
+<!--
 		<script type="text/javascript" src="../build/Three.js"></script>
-
+-->
+		<script type="text/javascript" src="../src/Three.js"></script>
+		<script type="text/javascript" src="../src/core/Color.js"></script>
+		<script type="text/javascript" src="../src/core/Vector2.js"></script>
+		<script type="text/javascript" src="../src/core/Vector3.js"></script>
+		<script type="text/javascript" src="../src/core/Vector4.js"></script>
+		<script type="text/javascript" src="../src/core/Ray.js"></script>
+		<script type="text/javascript" src="../src/core/Rectangle.js"></script>
+		<script type="text/javascript" src="../src/core/Matrix3.js"></script>
+		<script type="text/javascript" src="../src/core/Matrix4.js"></script>
+		<script type="text/javascript" src="../src/core/Object3D.js"></script>
+		<script type="text/javascript" src="../src/core/Quaternion.js"></script>
+		<script type="text/javascript" src="../src/core/Vertex.js"></script>
+		<script type="text/javascript" src="../src/core/Face3.js"></script>
+		<script type="text/javascript" src="../src/core/Face4.js"></script>
+		<script type="text/javascript" src="../src/core/UV.js"></script>
+		<script type="text/javascript" src="../src/core/Geometry.js"></script>
+		<script type="text/javascript" src="../src/core/Spline.js"></script>
+		<script type="text/javascript" src="../src/animation/AnimationHandler.js"></script>
+		<script type="text/javascript" src="../src/animation/Animation.js"></script>
+		<script type="text/javascript" src="../src/cameras/Camera.js"></script>
+		<script type="text/javascript" src="../src/lights/Light.js"></script>
+		<script type="text/javascript" src="../src/lights/AmbientLight.js"></script>
+		<script type="text/javascript" src="../src/lights/DirectionalLight.js"></script>
+		<script type="text/javascript" src="../src/lights/PointLight.js"></script>
+		<script type="text/javascript" src="../src/materials/Material.js"></script>
+		<script type="text/javascript" src="../src/materials/Mappings.js"></script>
+		<script type="text/javascript" src="../src/materials/LineBasicMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshBasicMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshLambertMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshPhongMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshDepthMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshNormalMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshFaceMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/MeshShaderMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/ParticleBasicMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/ParticleCircleMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/ParticleDOMMaterial.js"></script>
+		<script type="text/javascript" src="../src/materials/Texture.js"></script>
+		<script type="text/javascript" src="../src/materials/RenderTarget.js"></script>
+		<script type="text/javascript" src="../src/materials/Uniforms.js"></script>
+		<script type="text/javascript" src="../src/objects/Particle.js"></script>
+		<script type="text/javascript" src="../src/objects/ParticleSystem.js"></script>
+		<script type="text/javascript" src="../src/objects/Line.js"></script>
+		<script type="text/javascript" src="../src/objects/Mesh.js"></script>
+		<script type="text/javascript" src="../src/objects/Bone.js"></script>
+		<script type="text/javascript" src="../src/objects/SkinnedMesh.js"></script>
+		<script type="text/javascript" src="../src/objects/Ribbon.js"></script>
+		<script type="text/javascript" src="../src/objects/Sound.js"></script>
+		<script type="text/javascript" src="../src/objects/LOD.js"></script>
+		<script type="text/javascript" src="../src/scenes/Scene.js"></script>
+		<script type="text/javascript" src="../src/scenes/Fog.js"></script>
+		<script type="text/javascript" src="../src/scenes/FogExp2.js"></script>
+		<script type="text/javascript" src="../src/renderers/Projector.js"></script>
+		<script type="text/javascript" src="../src/renderers/DOMRenderer.js"></script>
+		<script type="text/javascript" src="../src/renderers/CanvasRenderer.js"></script>
+		<script type="text/javascript" src="../src/renderers/SVGRenderer.js"></script>
+		<script type="text/javascript" src="../src/renderers/WebGLShaders.js"></script>
+		<script type="text/javascript" src="../src/renderers/WebGLRenderer.js"></script>
+		<script type="text/javascript" src="../src/renderers/SoundRenderer.js"></script>
+		<script type="text/javascript" src="../src/renderers/renderables/RenderableObject.js"></script>
+		<script type="text/javascript" src="../src/renderers/renderables/RenderableFace3.js"></script>
+		<script type="text/javascript" src="../src/renderers/renderables/RenderableParticle.js"></script>
+		<script type="text/javascript" src="../src/renderers/renderables/RenderableLine.js"></script>
+		<script type="text/javascript" src="../src/extras/GeometryUtils.js"></script>
+		<script type="text/javascript" src="../src/extras/ImageUtils.js"></script>
+		<script type="text/javascript" src="../src/extras/SceneUtils.js"></script>
+		<script type="text/javascript" src="../src/extras/ShaderUtils.js"></script>
+		<script type="text/javascript" src="../src/extras/cameras/QuakeCamera.js"></script>
+		<script type="text/javascript" src="../src/extras/cameras/PathCamera.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Cube.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Cylinder.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Icosahedron.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Lathe.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Plane.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Sphere.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/Torus.js"></script>
+		<script type="text/javascript" src="../src/extras/geometries/TorusKnot.js"></script>
+		<script type="text/javascript" src="../src/extras/io/Loader.js"></script>
+		<script type="text/javascript" src="../src/extras/io/JSONLoader.js"></script>
+		<script type="text/javascript" src="../src/extras/io/BinaryLoader.js"></script>
+		<script type="text/javascript" src="../src/extras/objects/MarchingCubes.js"></script>
+		
 		<script type="text/javascript" src="js/Detector.js"></script>
 		<script type="text/javascript" src="js/RequestAnimationFrame.js"></script>
 		<script type="text/javascript" src="js/Stats.js"></script>
@@ -192,12 +275,12 @@
 				bcanvas.addEventListener("click", toggleCanvas, false);
 				bwebgl.addEventListener("click", toggleWebGL, false);
 
-				var loader = new THREE.Loader(),
+				var loader = new THREE.JSONLoader(),
 					callbackMale   = function( geometry ) { createScene( geometry,  90, 50, FLOOR, 105 ) },
 					callbackFemale = function( geometry ) { createScene( geometry, -80, 50, FLOOR, 0 ) };
 
-				loader.loadAscii( { model: "obj/male02/Male02_slim.js", callback: callbackMale } );
-				loader.loadAscii( { model: "obj/female02/Female02_slim.js", callback: callbackFemale } );
+				//loader.load( { model: "obj/male02/Male02_slim.js", callback: callbackMale } );
+				//loader.load( { model: "obj/female02/Female02_slim.js", callback: callbackFemale } );
 
 				//loader.loadBinary( { model: "obj/male02/Male02_bin.js", callback: callbackMale } );
 				//loader.loadBinary( { model: "obj/female02/Female02_bin.js", callback: callbackFemale } );

src/core/Face3.js

@@ -10,7 +10,7 @@ THREE.Face3 = function ( a, b, c, normal, color, materials ) {
 	this.c = c;
 
 	this.normal = normal instanceof THREE.Vector3 ? normal : new THREE.Vector3();
-	this.vertexNormals = normal instanceof Array ? normal : [ new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3() ];
+	this.vertexNormals = normal instanceof Array ? normal : [ ];
 
 	this.color = color instanceof THREE.Color ? color : new THREE.Color();
 	this.vertexColors = color instanceof Array ? color : [];

src/core/Face4.js

@@ -11,7 +11,7 @@ THREE.Face4 = function ( a, b, c, d, normal, color, materials ) {
 	this.d = d;
 
 	this.normal = normal instanceof THREE.Vector3 ? normal : new THREE.Vector3();
-	this.vertexNormals = normal instanceof Array ? normal : [ new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3(), new THREE.Vector3() ];
+	this.vertexNormals = normal instanceof Array ? normal : [ ];
 
 	this.color = color instanceof THREE.Color ? color : new THREE.Color();
 	this.vertexColors = color instanceof Array ? color : [];

src/extras/geometries/Sphere.js

@@ -6,7 +6,7 @@
 var Sphere = function ( radius, segmentsWidth, segmentsHeight ) {
 
 	THREE.Geometry.call( this );
-
+	
 	var gridX = segmentsWidth || 8,
 	gridY = segmentsHeight || 6;
 

src/extras/io/BinaryLoader.js

@@ -37,7 +37,7 @@ THREE.BinaryLoader.prototype = {
 
 			s = (new Date).getTime(),
 			worker = new Worker( url ),
-			callback_progress = this.showProgress ? THREE.LoaderOld.prototype.updateProgress : null;
+			callback_progress = this.showProgress ? THREE.Loader.prototype.updateProgress : null;
 		
 		worker.onmessage = function( event ) {
 
@@ -765,5 +765,4 @@ THREE.BinaryLoader.prototype = {
 
 	}
 
-
 };	
\ No newline at end of file

src/extras/io/JSONLoader.js

@@ -24,6 +24,8 @@ THREE.JSONLoader.prototype = {
 
 	load: function ( parameters ) {
 
+		console.log( parameters );
+		
 		var url = parameters.model,
 			callback = parameters.callback, 
 		    texture_path = parameters.texture_path ? parameters.texture_path : THREE.Loader.prototype.extractUrlbase( url ),
@@ -33,6 +35,8 @@ THREE.JSONLoader.prototype = {
 		
 		worker.onmessage = function( event ) {
 			
+			console.log( event.data );
+			
 			THREE.JSONLoader.prototype.createModel( event.data, callback, texture_path );
 
 		};
@@ -296,12 +300,12 @@ THREE.JSONLoader.prototype = {
 				
 			};
 			
-			Model.prototype = new THREE.Geometry();
-			Model.prototype.constructor = Model;
+		};
 
-			callback( new Model( texture_path ) );
+		Model.prototype = new THREE.Geometry();
+		Model.prototype.constructor = Model;
 
-		}
+		callback( new Model( texture_path ) );
 
 	}
 

src/extras/io/Loader.js

@@ -4,17 +4,17 @@
 
 THREE.Loader = function ( showStatus ) {
 
-	this.showStatus = showStatus;
-	this.statusDomElement = showStatus ? this.addStatusElement() : null;
+	this.showStatus = showStatus;	
+	this.statusDomElement = showStatus ? THREE.Loader.prototype.addStatusElement() : null;
 
 };
 
 THREE.Loader.prototype = {
 
 	addStatusElement: function ( ) {
-
+		
 		var e = document.createElement( "div" );
-
+		
 		e.style.fontSize = "0.8em"; 
 		e.style.textAlign = "left";
 		e.style.background = "#b00"; 
@@ -25,13 +25,13 @@ THREE.Loader.prototype = {
 		e.style.right = "0px"; 
 		e.style.top = "0px"; 
 		e.style.zIndex = 1000;
-
+		
 		e.innerHTML = "Loading ...";
-
+		
 		return e;
-
+		
 	},
-
+	
 	updateProgress: function ( progress ) {
 
 		var message = "Loaded ";

src/renderers/WebGLRenderer.js

@@ -355,11 +355,13 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 		}
 		
-		materials = unrollGroupMaterials( geometryGroup, object );
+		materials = unrollGroupMaterials( geometryGroup, object );		
 		
 		uvType = bufferGuessUVType( materials, geometryGroup, object );
-		vertexColorType = bufferGuessVertexColorType( materials, geometryGroup, object );
 		normalType = bufferGuessNormalType( materials, geometryGroup, object );
+		vertexColorType = bufferGuessVertexColorType( materials, geometryGroup, object );
+
+		console.log(uvType, normalType, vertexColorType, geometry, materials );
 
 		geometryGroup.__vertexArray = new Float32Array( nvertices * 3 );
 		
@@ -382,7 +384,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 		}
 
 		if ( uvType ) {
-		
+			
 			if ( geometry.faceUvs.length > 0 || geometry.faceVertexUvs.length > 0 ) {
 			
 				geometryGroup.__uvArray = new Float32Array( nvertices * 2 );
@@ -437,6 +439,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 		var f, fl, fi, face, 
 			vertexNormals, faceNormal, normal,
 			vertexColors, faceColor,
+			uvType, vertexColorType, normalType,
 			uv, uv2, v1, v2, v3, v4, t1, t2, t3, t4,
 			c1, c2, c3, c4,
 			sw1, sw2, sw3, sw4,
@@ -480,6 +483,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 		needsSmoothNormals = geometryGroup.__needsSmoothNormals,
 		
 		vertexColorType = geometryGroup.__vertexColorType,
+		uvType = geometryGroup.__uvType,
+		normalType = geometryGroup.__normalType,
 
 		geometry = object.geometry, // this is shared for all chunks
 
@@ -729,7 +734,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 				}
 
-				if ( dirtyNormals ) {
+				if ( dirtyNormals && normalType ) {
 
 					if ( vertexNormals.length == 3 && needsSmoothNormals ) {
 
@@ -761,7 +766,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 				}
 
-				if ( dirtyUvs && uv !== undefined ) {
+				if ( dirtyUvs && uv !== undefined && uvType ) {
 
 					for ( i = 0; i < 3; i ++ ) {
 
@@ -776,7 +781,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 				}
 
-				if ( dirtyUvs && uv2 !== undefined ) {
+				if ( dirtyUvs && uv2 !== undefined && uvType ) {
 
 					for ( i = 0; i < 3; i ++ ) {
 
@@ -1059,7 +1064,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 				}
 
-				if( dirtyNormals ) {
+				if( dirtyNormals && normalType ) {
 
 					if ( vertexNormals.length == 4 && needsSmoothNormals ) {
 
@@ -1091,7 +1096,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 				}
 
-				if ( dirtyUvs && uv !== undefined ) {
+				if ( dirtyUvs && uv !== undefined && uvType ) {
 
 					for ( i = 0; i < 4; i ++ ) {
 
@@ -1106,7 +1111,7 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 				}
 
-				if ( dirtyUvs && uv2 !== undefined ) {
+				if ( dirtyUvs && uv2 !== undefined && uvType ) {
 
 					for ( i = 0; i < 4; i ++ ) {
 
@@ -3445,6 +3450,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 			material, meshMaterial,
 			materials = [];
 		
+		console.log( "unrollGroupMaterials", object.materials, geometryGroup );
+		
 		for ( m = 0, ml = object.materials.length; m < ml; m++ ) {
 
 			meshMaterial = object.materials[ m ];

utils/build.py

@@ -95,6 +95,7 @@ EXTRAS_FILES = [
 'extras/geometries/TorusKnot.js',
 'extras/io/Loader.js',
 'extras/io/JSONLoader.js',
+'extras/io/BinaryLoader.js',
 'extras/objects/MarchingCubes.js'
 ]
 

utils/exporters/convert_obj_three.py

@@ -156,6 +156,7 @@ TEMPLATE_FILE_ASCII = u"""\
 
 
 var model = {
+
     'version' : 2,
     
     'materials': [%(materials)s],
@@ -171,7 +172,8 @@ var model = {
     'faces': [%(faces)s],
 
     'end': (new Date).getTime()
-    }
+    
+};
     
 postMessage( model );
 """
@@ -187,6 +189,7 @@ TEMPLATE_FILE_BIN = u"""\
 
 
 var model = {
+
     'version' : 1,
 
     'materials': [%(materials)s],
@@ -194,7 +197,8 @@ var model = {
     'buffers': '%(buffers)s',
 
     'end': (new Date).getTime()
-    }
+    
+};
     
 postMessage( model );
 """