提交 5ec5d6d6 编写于 作者: M Mugen87

Loaders: Harmonize crossOrigin default value

上级 5aff15a3
......@@ -21,7 +21,7 @@ THREE.AssimpJSONLoader.prototype = {
constructor: THREE.AssimpJSONLoader,
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
load: function ( url, onLoad, onProgress, onError ) {
......@@ -67,6 +67,7 @@ THREE.AssimpJSONLoader.prototype = {
setCrossOrigin: function ( value ) {
this.crossOrigin = value;
return this;
},
......@@ -221,8 +222,10 @@ THREE.AssimpJSONLoader.prototype = {
case '$mat.opacity':
if ( value < 1 ) {
material.opacity = value;
material.transparent = true;
}
break;
......
......@@ -12,7 +12,7 @@ THREE.AssimpLoader.prototype = {
constructor: THREE.AssimpLoader,
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
load: function ( url, onLoad, onProgress, onError ) {
......@@ -34,6 +34,7 @@ THREE.AssimpLoader.prototype = {
setCrossOrigin: function ( value ) {
this.crossOrigin = value;
return this;
},
......@@ -1129,7 +1130,7 @@ THREE.AssimpLoader.prototype = {
}
if ( ! key ) {
return null;
} else if ( nextKey ) {
......@@ -1150,7 +1151,7 @@ THREE.AssimpLoader.prototype = {
var l = T / dT;
return lerp( key.mValue.toTHREE(), nextKey.mValue.toTHREE(), l );
}
}
......
......@@ -19,7 +19,7 @@ THREE.BinaryLoader.prototype = {
constructor: THREE.BinaryLoader,
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
// Load models generated by slim OBJ converter with BINARY option (converter_obj_three_slim.py -t binary)
// - binary models consist of two files: JS and BIN
......@@ -66,18 +66,21 @@ THREE.BinaryLoader.prototype = {
setBinaryPath: function ( value ) {
this.binaryPath = value;
return this;
},
setCrossOrigin: function ( value ) {
this.crossOrigin = value;
return this;
},
setTexturePath: function ( value ) {
this.texturePath = value;
return this;
},
......
......@@ -13,7 +13,7 @@ THREE.ColladaLoader.prototype = {
constructor: THREE.ColladaLoader,
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
load: function ( url, onLoad, onProgress, onError ) {
......@@ -33,6 +33,7 @@ THREE.ColladaLoader.prototype = {
setPath: function ( value ) {
this.path = value;
return this;
},
......@@ -49,6 +50,7 @@ THREE.ColladaLoader.prototype = {
setCrossOrigin: function ( value ) {
this.crossOrigin = value;
return this;
},
......
......@@ -42,9 +42,6 @@ THREE.DRACOLoader.prototype = {
var loader = new THREE.FileLoader(scope.manager);
loader.setPath(this.path);
loader.setResponseType('arraybuffer');
if (this.crossOrigin !== undefined) {
loader.crossOrigin = this.crossOrigin;
}
loader.load(url, function(blob) {
scope.decodeDracoFile(blob, onLoad);
}, onProgress, onError);
......@@ -55,11 +52,6 @@ THREE.DRACOLoader.prototype = {
return this;
},
setCrossOrigin: function(value) {
this.crossOrigin = value;
return this;
},
setVerbosity: function(level) {
this.verbosity = level;
return this;
......@@ -146,7 +138,7 @@ THREE.DRACOLoader.prototype = {
},
addAttributeToGeometry: function(dracoDecoder, decoder, dracoGeometry,
attributeName, attributeType, attribute,
attributeName, attributeType, attribute,
geometry, geometryBuffer) {
if (attribute.ptr === 0) {
var errorMsg = 'THREE.DRACOLoader: No attribute ' + attributeName;
......@@ -224,7 +216,7 @@ THREE.DRACOLoader.prototype = {
throw new Error( errorMsg );
}
// Copy data from decoder.
for (var i = 0; i < numValues; i++) {
geometryBuffer[attributeName][i] = attributeData.GetValue(i);
......
......@@ -32,6 +32,8 @@
Object.assign( THREE.FBXLoader.prototype, {
crossOrigin: 'anonymous',
load: function ( url, onLoad, onProgress, onError ) {
var self = this;
......@@ -63,6 +65,13 @@
},
setCrossOrigin: function ( value ) {
this.crossOrigin = value;
return this;
},
parse: function ( FBXBuffer, resourceDirectory ) {
var FBXTree;
......@@ -93,9 +102,11 @@
// console.log( FBXTree );
var textureLoader = new THREE.TextureLoader( this.manager ).setPath( resourceDirectory ).setCrossOrigin( this.crossOrigin );
var connections = parseConnections( FBXTree );
var images = parseImages( FBXTree );
var textures = parseTextures( FBXTree, new THREE.TextureLoader( this.manager ).setPath( resourceDirectory ), images, connections );
var textures = parseTextures( FBXTree, textureLoader, images, connections );
var materials = parseMaterials( FBXTree, textures, connections );
var deformers = parseDeformers( FBXTree, connections );
var geometryMap = parseGeometries( FBXTree, connections, deformers );
......
......@@ -19,7 +19,7 @@ THREE.GLTFLoader = ( function () {
constructor: GLTFLoader,
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
load: function ( url, onLoad, onProgress, onError ) {
......
......@@ -1240,7 +1240,7 @@ THREE.LoaderSupport.WorkerDirector = (function () {
this.maxQueueSize = MAX_QUEUE_SIZE ;
this.maxWebWorkers = MAX_WEB_WORKER;
this.crossOrigin = null;
this.crossOrigin = 'anonymous';
if ( ! Validator.isValid( classDef ) ) throw 'Provided invalid classDef: ' + classDef;
......
......@@ -50,7 +50,7 @@ THREE.MMDLoader = ( function () {
constructor: MMDLoader,
crossOrigin: undefined,
crossOrigin: 'anonymous',
/**
* @param {string} value
......@@ -329,7 +329,7 @@ THREE.MMDLoader = ( function () {
constructor: MeshBuilder,
crossOrigin: undefined,
crossOrigin: 'anonymous',
/**
* @param {string} crossOrigin
......@@ -876,7 +876,7 @@ THREE.MMDLoader = ( function () {
constructor: MaterialBuilder,
crossOrigin: undefined,
crossOrigin: 'anonymous',
texturePath: undefined,
......@@ -946,7 +946,7 @@ THREE.MMDLoader = ( function () {
params.shininess = Math.max( material.shininess, 1e-4 ); // to prevent pow( 0.0, 0.0 )
params.transparent = params.opacity !== 1.0;
//
//
params.skinning = geometry.bones.length > 0 ? true : false;
params.morphTargets = geometry.morphTargets.length > 0 ? true : false;
......
......@@ -208,11 +208,12 @@ THREE.MTLLoader.MaterialCreator.prototype = {
constructor: THREE.MTLLoader.MaterialCreator,
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
setCrossOrigin: function ( value ) {
this.crossOrigin = value;
return this;
},
......
......@@ -26,7 +26,7 @@ THREE.VRMLLoader.prototype = {
recordingFieldname: null,
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
load: function ( url, onLoad, onProgress, onError ) {
......@@ -44,6 +44,7 @@ THREE.VRMLLoader.prototype = {
setCrossOrigin: function ( value ) {
this.crossOrigin = value;
return this;
},
......
......@@ -26,7 +26,7 @@ THREE.VRMLoader = ( function () {
constructor: VRMLoader,
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
load: function ( url, onLoad, onProgress, onError ) {
......
......@@ -17,7 +17,7 @@ THREE.LegacyGLTFLoader = ( function () {
constructor: LegacyGLTFLoader,
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
load: function ( url, onLoad, onProgress, onError ) {
......@@ -40,6 +40,7 @@ THREE.LegacyGLTFLoader = ( function () {
setCrossOrigin: function ( value ) {
this.crossOrigin = value;
return this;
},
......
......@@ -15,7 +15,7 @@ function CubeTextureLoader( manager ) {
Object.assign( CubeTextureLoader.prototype, {
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
load: function ( urls, onLoad, onProgress, onError ) {
......
......@@ -14,7 +14,7 @@ function ImageLoader( manager ) {
Object.assign( ImageLoader.prototype, {
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
load: function ( url, onLoad, onProgress, onError ) {
......
......@@ -61,7 +61,7 @@ Loader.Handlers = {
Object.assign( Loader.prototype, {
crossOrigin: undefined,
crossOrigin: 'anonymous',
onLoadStart: function () {},
......
......@@ -16,7 +16,7 @@ function TextureLoader( manager ) {
Object.assign( TextureLoader.prototype, {
crossOrigin: 'Anonymous',
crossOrigin: 'anonymous',
load: function ( url, onLoad, onProgress, onError ) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册