Bläddra i källkod

Changed UTF8v2Loader and CTMLoader to use BufferGeometry by default.

alteredq 13 år sedan
förälder
incheckning
d2921d5275

+ 3 - 1
examples/js/loaders/UTF8v2Loader.js

@@ -819,7 +819,9 @@ THREE.UTF8v2Loader.prototype.createMeshCallback = function( materialBaseUrl, loa
         // bboxen defines the bounding box
         // meshParams contains the material info
 
-		if ( loadModelInfo.options.useBuffers ) {
+		var useBuffers = loadModelInfo.options.useBuffers !== undefined ? loadModelInfo.options.useBuffers : true;
+
+		if ( useBuffers ) {
 
 			var geometry = bufferGeometryCreator.create( attribArray, indexArray );
 

+ 3 - 3
examples/js/loaders/ctm/CTMLoader.js

@@ -88,6 +88,7 @@ THREE.CTMLoader.prototype.load = function( url, callback, parameters ) {
 	var scope = this;
 
 	var offsets = parameters.offsets !== undefined ? parameters.offsets : [ 0 ];
+	var useBuffers = parameters.useBuffers !== undefined ? parameters.useBuffers : true;
 
 	var xhr = new XMLHttpRequest(),
 		callbackProgress = null;
@@ -116,7 +117,7 @@ THREE.CTMLoader.prototype.load = function( url, callback, parameters ) {
 
 							var ctmFile = files[ i ];
 
-							if ( parameters.useBuffers ) {
+							if ( useBuffers ) {
 
 								scope.createModelBuffers( ctmFile, callback );
 
@@ -137,7 +138,6 @@ THREE.CTMLoader.prototype.load = function( url, callback, parameters ) {
 
 				} else {
 
-
 					for ( var i = 0; i < offsets.length; i ++ ) {
 
 						var stream = new CTM.Stream( binaryData );
@@ -145,7 +145,7 @@ THREE.CTMLoader.prototype.load = function( url, callback, parameters ) {
 
 						var ctmFile = new CTM.File( stream );
 
-						if ( parameters.useBuffers ) {
+						if ( useBuffers ) {
 
 							scope.createModelBuffers( ctmFile, callback );
 

+ 3 - 3
examples/webgl_loader_ctm.html

@@ -163,7 +163,7 @@
 					callbackModel( geometry, 450, material, 0, -200, 0, 0, 0 );
 					checkTime();
 
-				}, { useWorker: true, useBuffers: true } );
+				}, { useWorker: true } );
 
 				loader.load( "models/ctm/WaltHead.ctm",  function( geometry ) {
 
@@ -177,7 +177,7 @@
 
 					checkTime();
 
-				}, { useWorker: true, useBuffers: true } );
+				}, { useWorker: true } );
 
 				loader.load( "models/ctm/LeePerry.ctm",  function( geometry ) {
 
@@ -223,7 +223,7 @@
 					callbackModel( geometry, 1300, material, 200, 50, 0, 0, 0 );
 					checkTime();
 
-				}, { useWorker: true, useBuffers: true } );
+				}, { useWorker: true } );
 
 			}
 

+ 1 - 1
examples/webgl_loader_ctm_materials.html

@@ -221,7 +221,7 @@
 
 					console.log( "load time:", end - start, "ms" );
 
-				}, { useWorker: true, useBuffers: true } );
+				}, { useWorker: true } );
 
 			}
 

+ 2 - 2
examples/webgl_loader_utf8_r104.html

@@ -165,7 +165,7 @@
 
 					} );
 
-				}, { normalizeRGB: true, useBuffers: true } );
+				}, { normalizeRGB: true } );
 
 				loader.load( "models/utf8_r104/ben.js", function ( object ) {
 
@@ -192,7 +192,7 @@
 
 					} );
 
-				}, { normalizeRGB: true, useBuffers: true } );
+				}, { normalizeRGB: true } );
 
 				//