|
@@ -42,9 +42,6 @@ THREE.DRACOLoader.prototype = {
|
|
var loader = new THREE.FileLoader(scope.manager);
|
|
var loader = new THREE.FileLoader(scope.manager);
|
|
loader.setPath(this.path);
|
|
loader.setPath(this.path);
|
|
loader.setResponseType('arraybuffer');
|
|
loader.setResponseType('arraybuffer');
|
|
- if (this.crossOrigin !== undefined) {
|
|
|
|
- loader.crossOrigin = this.crossOrigin;
|
|
|
|
- }
|
|
|
|
loader.load(url, function(blob) {
|
|
loader.load(url, function(blob) {
|
|
scope.decodeDracoFile(blob, onLoad);
|
|
scope.decodeDracoFile(blob, onLoad);
|
|
}, onProgress, onError);
|
|
}, onProgress, onError);
|
|
@@ -55,11 +52,6 @@ THREE.DRACOLoader.prototype = {
|
|
return this;
|
|
return this;
|
|
},
|
|
},
|
|
|
|
|
|
- setCrossOrigin: function(value) {
|
|
|
|
- this.crossOrigin = value;
|
|
|
|
- return this;
|
|
|
|
- },
|
|
|
|
-
|
|
|
|
setVerbosity: function(level) {
|
|
setVerbosity: function(level) {
|
|
this.verbosity = level;
|
|
this.verbosity = level;
|
|
return this;
|
|
return this;
|
|
@@ -146,7 +138,7 @@ THREE.DRACOLoader.prototype = {
|
|
},
|
|
},
|
|
|
|
|
|
addAttributeToGeometry: function(dracoDecoder, decoder, dracoGeometry,
|
|
addAttributeToGeometry: function(dracoDecoder, decoder, dracoGeometry,
|
|
- attributeName, attributeType, attribute,
|
|
|
|
|
|
+ attributeName, attributeType, attribute,
|
|
geometry, geometryBuffer) {
|
|
geometry, geometryBuffer) {
|
|
if (attribute.ptr === 0) {
|
|
if (attribute.ptr === 0) {
|
|
var errorMsg = 'THREE.DRACOLoader: No attribute ' + attributeName;
|
|
var errorMsg = 'THREE.DRACOLoader: No attribute ' + attributeName;
|
|
@@ -224,7 +216,7 @@ THREE.DRACOLoader.prototype = {
|
|
throw new Error( errorMsg );
|
|
throw new Error( errorMsg );
|
|
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
// Copy data from decoder.
|
|
// Copy data from decoder.
|
|
for (var i = 0; i < numValues; i++) {
|
|
for (var i = 0; i < numValues; i++) {
|
|
geometryBuffer[attributeName][i] = attributeData.GetValue(i);
|
|
geometryBuffer[attributeName][i] = attributeData.GetValue(i);
|