mirror of
https://git.mirrors.martin98.com/https://github.com/google/draco
synced 2025-08-20 14:19:15 +08:00
Merge pull request #332 from donmccurdy/feat-dracoloader-parallel-decoding
DRACOLoader: Support requests for multiple files in parallel
This commit is contained in:
commit
f3b5989b1d
@ -24,8 +24,6 @@ THREE.DRACOLoader = function(manager) {
|
||||
this.verbosity = 0;
|
||||
this.attributeOptions = {};
|
||||
this.drawMode = THREE.TrianglesDrawMode;
|
||||
// User defined unique id for attributes.
|
||||
this.attributeUniqueIdMap = {};
|
||||
// Native Draco attribute type to Three.JS attribute type.
|
||||
this.nativeAttributeMap = {
|
||||
'position' : 'POSITION',
|
||||
@ -104,14 +102,15 @@ THREE.DRACOLoader.prototype = {
|
||||
*/
|
||||
decodeDracoFile: function(rawBuffer, callback, attributeUniqueIdMap) {
|
||||
var scope = this;
|
||||
this.attributeUniqueIdMap = attributeUniqueIdMap || {};
|
||||
THREE.DRACOLoader.getDecoderModule()
|
||||
.then( function ( module ) {
|
||||
scope.decodeDracoFileInternal( rawBuffer, module.decoder, callback );
|
||||
scope.decodeDracoFileInternal( rawBuffer, module.decoder, callback,
|
||||
attributeUniqueIdMap );
|
||||
});
|
||||
},
|
||||
|
||||
decodeDracoFileInternal: function(rawBuffer, dracoDecoder, callback) {
|
||||
decodeDracoFileInternal: function(rawBuffer, dracoDecoder, callback,
|
||||
attributeUniqueIdMap) {
|
||||
/*
|
||||
* Here is how to use Draco Javascript decoder and get the geometry.
|
||||
*/
|
||||
@ -137,7 +136,7 @@ THREE.DRACOLoader.prototype = {
|
||||
throw new Error(errorMsg);
|
||||
}
|
||||
callback(this.convertDracoGeometryTo3JS(dracoDecoder, decoder,
|
||||
geometryType, buffer));
|
||||
geometryType, buffer, attributeUniqueIdMap));
|
||||
},
|
||||
|
||||
addAttributeToGeometry: function(dracoDecoder, decoder, dracoGeometry,
|
||||
@ -168,7 +167,7 @@ THREE.DRACOLoader.prototype = {
|
||||
},
|
||||
|
||||
convertDracoGeometryTo3JS: function(dracoDecoder, decoder, geometryType,
|
||||
buffer) {
|
||||
buffer, attributeUniqueIdMap) {
|
||||
if (this.getAttributeOptions('position').skipDequantization === true) {
|
||||
decoder.SkipAttributeTransform(dracoDecoder.POSITION);
|
||||
}
|
||||
@ -236,7 +235,7 @@ THREE.DRACOLoader.prototype = {
|
||||
for (var attributeName in this.nativeAttributeMap) {
|
||||
// The native attribute type is only used when no unique Id is
|
||||
// provided. For example, loading .drc files.
|
||||
if (this.attributeUniqueIdMap[attributeName] === undefined) {
|
||||
if (attributeUniqueIdMap[attributeName] === undefined) {
|
||||
var attId = decoder.GetAttributeId(dracoGeometry,
|
||||
dracoDecoder[this.nativeAttributeMap[attributeName]]);
|
||||
if (attId !== -1) {
|
||||
@ -251,8 +250,8 @@ THREE.DRACOLoader.prototype = {
|
||||
}
|
||||
|
||||
// Add attributes of user specified unique id. E.g. GLTF models.
|
||||
for (var attributeName in this.attributeUniqueIdMap) {
|
||||
var attributeId = this.attributeUniqueIdMap[attributeName];
|
||||
for (var attributeName in attributeUniqueIdMap) {
|
||||
var attributeId = attributeUniqueIdMap[attributeName];
|
||||
var attribute = decoder.GetAttributeByUniqueId(dracoGeometry,
|
||||
attributeId);
|
||||
this.addAttributeToGeometry(dracoDecoder, decoder, dracoGeometry,
|
||||
|
Loading…
x
Reference in New Issue
Block a user