Update DRACOLoader and draco_decoder.

Adds isVersionSupported() method.

examples/js/loaders/DRACOLoader.js

@@ -44,49 +44,37 @@ THREE.DRACOLoader.prototype = {
  this.verbosity = level;
  },
 
- decodeDracoFile: ( function() {
- let dracoDecoder;
+ decodeDracoFile: function(rawBuffer) {
+ const dracoDecoder = THREE.DRACOLoader.getDecoder();
+ /*
+ * Here is how to use Draco Javascript decoder and get the geometry.
+ */
+ const buffer = new dracoDecoder.DecoderBuffer();
+ buffer.Init(new Int8Array(rawBuffer), rawBuffer.byteLength);
+ const wrapper = new dracoDecoder.WebIDLWrapper();
 
- if (typeof DracoModule === 'function') {
- dracoDecoder = DracoModule();
- } else {
- console.error('THREE.DRACOLoader: DracoModule not found.');
- return;
+ /*
+ * Determine what type is this file: mesh or point cloud.
+ */
+ const geometryType = wrapper.GetEncodedGeometryType(buffer);
+ if (geometryType == dracoDecoder.TRIANGULAR_MESH) {
+ if (this.verbosity > 0) {
+ console.log('Loaded a mesh.');
  }
-
- return function(rawBuffer) {
- const scope = this;
- /*
- * Here is how to use Draco Javascript decoder and get the geometry.
- */
- const buffer = new dracoDecoder.DecoderBuffer();
- buffer.Init(new Int8Array(rawBuffer), rawBuffer.byteLength);
- const wrapper = new dracoDecoder.WebIDLWrapper();
-
- /*
- * Determine what type is this file: mesh or point cloud.
- */
- const geometryType = wrapper.GetEncodedGeometryType(buffer);
- if (geometryType == dracoDecoder.TRIANGULAR_MESH) {
- if (this.verbosity > 0) {
- console.log('Loaded a mesh.');
- }
- } else if (geometryType == dracoDecoder.POINT_CLOUD) {
- if (this.verbosity > 0) {
- console.log('Loaded a point cloud.');
- }
- } else {
- const errorMsg = 'THREE.DRACOLoader: Unknown geometry type.'
- console.error(errorMsg);
- throw new Error(errorMsg);
- }
- return scope.convertDracoGeometryTo3JS(wrapper, geometryType, buffer,
- dracoDecoder);
+ } else if (geometryType == dracoDecoder.POINT_CLOUD) {
+ if (this.verbosity > 0) {
+ console.log('Loaded a point cloud.');
  }
- } )(),
+ } else {
+ const errorMsg = 'THREE.DRACOLoader: Unknown geometry type.'
+ console.error(errorMsg);
+ throw new Error(errorMsg);
+ }
+ return this.convertDracoGeometryTo3JS(wrapper, geometryType, buffer);
+ },
 
- convertDracoGeometryTo3JS: function(wrapper, geometryType, buffer,
-  dracoDecoder) {
+ convertDracoGeometryTo3JS: function(wrapper, geometryType, buffer) {
+ const dracoDecoder = THREE.DRACOLoader.getDecoder();
  let dracoGeometry;
  const start_time = performance.now();
  if (geometryType == dracoDecoder.TRIANGULAR_MESH) {
@@ -273,5 +261,28 @@ THREE.DRACOLoader.prototype = {
  console.log('Import time: ' + this.import_time);
  }
  return geometry;
+ },
+
+ isVersionSupported: function(version) {
+ return THREE.DRACOLoader.getDecoder().isVersionSupported(version);
  }
-};
+};
+
+/**
+ * Returns a singleton instance of the DracoModule decoder. Creating multiple
+ * copies of the decoder is expensive.
+ */
+THREE.DRACOLoader.getDecoder = (function() {
+ let decoder;
+
+ return function() {
+ if (typeof DracoModule === 'undefined') {
+ throw new Error('THREE.DRACOLoader: DracoModule not found.');
+ }
+
+ decoder = decoder || DracoModule();
+
+ return decoder;
+ };
+
+})();