Draco 1.5.7 release. (#1034)

* Draco 1.5.7 release.

CMakeLists.txt

@@ -13,6 +13,9 @@
 # the License.
 
 cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+if(DRACO_TRANSCODER_SUPPORTED)
+  set(CMAKE_CXX_STANDARD 17)
+endif()
 project(draco C CXX)
 
 if(NOT CMAKE_BUILD_TYPE)
@@ -479,10 +482,14 @@ list(
          "${draco_src_root}/metadata/geometry_metadata.h"
          "${draco_src_root}/metadata/metadata.cc"
          "${draco_src_root}/metadata/metadata.h"
+         "${draco_src_root}/metadata/property_attribute.cc"
+         "${draco_src_root}/metadata/property_attribute.h"
          "${draco_src_root}/metadata/property_table.cc"
          "${draco_src_root}/metadata/property_table.h"
          "${draco_src_root}/metadata/structural_metadata.cc"
-         "${draco_src_root}/metadata/structural_metadata.h")
+         "${draco_src_root}/metadata/structural_metadata.h"
+         "${draco_src_root}/metadata/structural_metadata_schema.cc"
+         "${draco_src_root}/metadata/structural_metadata_schema.h")
 
 list(APPEND draco_metadata_enc_sources
             "${draco_src_root}/metadata/metadata_encoder.cc"

README.md

@@ -14,6 +14,14 @@ delays can result in transient errors that can be difficult to diagnose when
 new Draco releases are launched. To avoid the issue pin your sites to a
 versioned release.
 
+### Version 1.5.7 release:
+* Using the versioned www.gstatic.com WASM and Javascript decoders continues
+  to be recommended. To use v1.5.7, use this URL:
+  * https://www.gstatic.com/draco/versioned/decoders/1.5.7/*
+* Added support for normalized attributes to Emscripten encoder API.
+* Bug fixes.
+* Security fixes.
+
 ### Version 1.5.6 release:
 * Using the versioned www.gstatic.com WASM and Javascript decoders continues
   to be recommended. To use v1.5.6, use this URL:

cmake/draco_build_definitions.cmake

@@ -56,7 +56,7 @@ macro(draco_set_build_definitions)
   # passed to libtool.
   #
   # We set DRACO_SOVERSION = [c-a].a.r
-  set(LT_CURRENT 8)
+  set(LT_CURRENT 9)
   set(LT_REVISION 0)
   set(LT_AGE 0)
   math(EXPR DRACO_SOVERSION_MAJOR "${LT_CURRENT} - ${LT_AGE}")

cmake/draco_tests.cmake

@@ -89,8 +89,10 @@ if(DRACO_TRANSCODER_SUPPORTED)
            "${draco_src_root}/io/texture_io_test.cc"
            "${draco_src_root}/material/material_library_test.cc"
            "${draco_src_root}/material/material_test.cc"
+           "${draco_src_root}/metadata/property_attribute_test.cc"
            "${draco_src_root}/metadata/property_table_test.cc"
            "${draco_src_root}/metadata/structural_metadata_test.cc"
+           "${draco_src_root}/metadata/structural_metadata_schema_test.cc"
            "${draco_src_root}/scene/instance_array_test.cc"
            "${draco_src_root}/scene/light_test.cc"
            "${draco_src_root}/scene/mesh_group_test.cc"

javascript/example/README.md

@@ -46,7 +46,7 @@ Create DracoLoader by setting the decoder type:
 
 ```js
 // (Optional) Change decoder source directory (defaults to
-// 'https://www.gstatic.com/draco/versioned/decoders/1.5.6/'). It is recommended
+// 'https://www.gstatic.com/draco/versioned/decoders/1.5.7/'). It is recommended
 // to always pull your Draco JavaScript and WASM decoders from this URL. Users
 // will benefit from having the Draco decoder in cache as more sites start using
 // the static URL.

javascript/example/webgl_loader_draco_advanced.html

@@ -38,7 +38,7 @@ <h1>Open a draco compressed file (.drc):</h1>
       // It is recommended to always pull your Draco JavaScript and WASM decoders
       // from this URL. Users will benefit from having the Draco decoder in cache
       // as more sites start using the static URL.
-      dracoLoader.setDecoderPath('https://www.gstatic.com/draco/versioned/decoders/1.5.6/');
+      dracoLoader.setDecoderPath('https://www.gstatic.com/draco/versioned/decoders/1.5.7/');
 
       var camera, cameraTarget, scene, renderer;
 

javascript/npm/draco3d/README.md

@@ -6,7 +6,7 @@
 News
 =======
 
-Check out the [README](https://github.com/google/draco/blob/1.5.6/README.md)
+Check out the [README](https://github.com/google/draco/blob/1.5.7/README.md)
 file for news about this release.
 
 Description

javascript/npm/draco3d/package.json

@@ -1,6 +1,6 @@
 {
   "name": "draco3d",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "description": "Draco is a library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.",
   "main": "draco3d.js",
   "scripts": {

javascript/npm/draco3dgltf/README.md

@@ -24,7 +24,7 @@ Draco github glTF branch URL: https://github.com/google/draco/tree/gltf_2.0_drac
 News
 =======
 
-Check out the [README](https://github.com/google/draco/blob/1.5.6/README.md)
+Check out the [README](https://github.com/google/draco/blob/1.5.7/README.md)
 file for news about this release.
 
 NPM Package

javascript/npm/draco3dgltf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "draco3dgltf",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "description": "This package contains a specific version of Draco 3D geometric compression library that is used for glTF Draco mesh compression extension.",
   "main": "draco3dgltf.js",
   "scripts": {

src/draco/attributes/attribute_quantization_transform.cc

@@ -14,6 +14,11 @@
 //
 #include "draco/attributes/attribute_quantization_transform.h"
 
+#include <cmath>
+#include <cstring>
+#include <memory>
+#include <vector>
+
 #include "draco/attributes/attribute_transform_type.h"
 #include "draco/core/quantization_utils.h"
 
@@ -144,6 +149,9 @@ bool AttributeQuantizationTransform::ComputeParameters(
        ++i) {
     attribute.GetValue(i, att_val.get());
     for (int c = 0; c < num_components; ++c) {
+      if (std::isnan(att_val[c])) {
+        return false;
+      }
       if (min_values_[c] > att_val[c]) {
         min_values_[c] = att_val[c];
       }

src/draco/attributes/geometry_attribute.cc

@@ -59,6 +59,9 @@ bool GeometryAttribute::CopyFrom(const GeometryAttribute &src_att) {
     }
     buffer_->Update(src_att.buffer_->data(), src_att.buffer_->data_size());
   }
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  name_ = src_att.name_;
+#endif
   return true;
 }
 
@@ -87,6 +90,11 @@ bool GeometryAttribute::operator==(const GeometryAttribute &va) const {
   if (byte_offset_ != va.byte_offset_) {
     return false;
   }
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  if (name_ != va.name_) {
+    return false;
+  }
+#endif
   return true;
 }
 

src/draco/attributes/geometry_attribute.h

@@ -245,6 +245,16 @@ class GeometryAttribute {
         return "TEX_COORD";
       case GENERIC:
         return "GENERIC";
+#ifdef DRACO_TRANSCODER_SUPPORTED
+      case TANGENT:
+        return "TANGENT";
+      case MATERIAL:
+        return "MATERIAL";
+      case JOINTS:
+        return "JOINTS";
+      case WEIGHTS:
+        return "WEIGHTS";
+#endif
       default:
         return "UNKNOWN";
     }
@@ -276,6 +286,10 @@ class GeometryAttribute {
   DataBufferDescriptor buffer_descriptor() const { return buffer_descriptor_; }
   uint32_t unique_id() const { return unique_id_; }
   void set_unique_id(uint32_t id) { unique_id_ = id; }
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  std::string name() const { return name_; }
+  void set_name(std::string name) { name_ = name; }
+#endif
 
  protected:
   // Sets a new internal storage for the attribute.
@@ -445,6 +459,10 @@ class GeometryAttribute {
   // multiple attribute of the same type in a point cloud.
   uint32_t unique_id_;
 
+#ifdef DRACO_TRANSCODER_SUPPORTED
+  std::string name_;
+#endif
+
   friend struct GeometryAttributeHasher;
 };
 

src/draco/attributes/point_attribute.cc

@@ -14,8 +14,8 @@
 //
 #include "draco/attributes/point_attribute.h"
 
+#include <tuple>
 #include <unordered_map>
-
 using std::unordered_map;
 
 // Shortcut for typed conditionals.
@@ -166,10 +166,12 @@ AttributeValueIndex::ValueType PointAttribute::DeduplicateFormattedValues(
   AttributeValueIndex unique_vals(0);
   typedef std::array<T, num_components_t> AttributeValue;
   typedef std::array<HashType, num_components_t> AttributeHashableValue;
+  typedef unordered_map<AttributeHashableValue, AttributeValueIndex,
+                        HashArray<AttributeHashableValue>>
+      ValueToIndexMap;
+
   // Hash map storing index of the first attribute with a given value.
-  unordered_map<AttributeHashableValue, AttributeValueIndex,
-                HashArray<AttributeHashableValue>>
-      value_to_index_map;
+  ValueToIndexMap value_to_index_map;
   AttributeValue att_value;
   AttributeHashableValue hashable_value;
   IndexTypeVector<AttributeValueIndex, AttributeValueIndex> value_map(
@@ -180,19 +182,19 @@ AttributeValueIndex::ValueType PointAttribute::DeduplicateFormattedValues(
     // Convert the value to hashable type. Bit-copy real attributes to integers.
     memcpy(&(hashable_value[0]), &(att_value[0]), sizeof(att_value));
 
-    // Check if the given attribute value has been used before already.
-    auto it = value_to_index_map.find(hashable_value);
-    if (it != value_to_index_map.end()) {
+    typename ValueToIndexMap::iterator it;
+    bool inserted;
+    std::tie(it, inserted) = value_to_index_map.insert(
+        std::pair<AttributeHashableValue, AttributeValueIndex>(hashable_value,
+                                                               unique_vals));
+
+    // Try to update the hash map with a new entry pointing to the latest unique
+    // vertex index.
+    if (!inserted) {
       // Duplicated value found. Update index mapping.
       value_map[i] = it->second;
     } else {
       // New unique value.
-      // Update the hash map with a new entry pointing to the latest unique
-      // vertex index.
-      value_to_index_map.insert(
-          std::pair<AttributeHashableValue, AttributeValueIndex>(hashable_value,
-                                                                 unique_vals));
-      // Add the unique value to the mesh builder.
       SetAttributeValue(unique_vals, &att_value);
       // Update index mapping.
       value_map[i] = unique_vals;

src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_encoder.h

@@ -200,7 +200,7 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramEncoder<
 
   // Bit-field used for computing permutations of excluded edges
   // (parallelograms).
-  bool exluded_parallelograms[kMaxNumParallelograms];
+  bool excluded_parallelograms[kMaxNumParallelograms];
 
   // Data about the number of used parallelogram and total number of available
   // parallelogram for each context. Used to compute overhead needed for storing
@@ -291,12 +291,12 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramEncoder<
          num_used_parallelograms <= num_parallelograms;
          ++num_used_parallelograms) {
       // Mark all parallelograms as excluded.
-      std::fill(exluded_parallelograms,
-                exluded_parallelograms + num_parallelograms, true);
+      std::fill(excluded_parallelograms,
+                excluded_parallelograms + num_parallelograms, true);
       // TODO(draco-eng) maybe this should be another std::fill.
       // Mark the first |num_used_parallelograms| as not excluded.
       for (int j = 0; j < num_used_parallelograms; ++j) {
-        exluded_parallelograms[j] = false;
+        excluded_parallelograms[j] = false;
       }
       // Permute over the excluded edges and compute error for each
       // configuration (permutation of excluded parallelograms).
@@ -307,7 +307,7 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramEncoder<
         }
         uint8_t configuration = 0;
         for (int j = 0; j < num_parallelograms; ++j) {
-          if (exluded_parallelograms[j]) {
+          if (excluded_parallelograms[j]) {
             continue;
           }
           for (int c = 0; c < num_components; ++c) {
@@ -322,15 +322,13 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramEncoder<
         }
         error = ComputeError(multi_pred_vals.data(), in_data + dst_offset,
                              &current_residuals[0], num_components);
-        if (num_parallelograms > 0) {
-          const int64_t new_overhead_bits = ComputeOverheadBits(
-              total_used_parallelograms[num_parallelograms - 1] +
-                  num_used_parallelograms,
-              total_parallelograms[num_parallelograms - 1]);
-
-          // Add overhead bits to the total error.
-          error.num_bits += new_overhead_bits;
-        }
+        const int64_t new_overhead_bits = ComputeOverheadBits(
+            total_used_parallelograms[num_parallelograms - 1] +
+                num_used_parallelograms,
+            total_parallelograms[num_parallelograms - 1]);
+
+        // Add overhead bits to the total error.
+        error.num_bits += new_overhead_bits;
         if (error < best_prediction.error) {
           best_prediction.error = error;
           best_prediction.configuration = configuration;
@@ -340,8 +338,9 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramEncoder<
           best_prediction.residuals.assign(current_residuals.begin(),
                                            current_residuals.end());
         }
-      } while (std::next_permutation(
-          exluded_parallelograms, exluded_parallelograms + num_parallelograms));
+      } while (
+          std::next_permutation(excluded_parallelograms,
+                                excluded_parallelograms + num_parallelograms));
     }
     if (num_parallelograms > 0) {
       total_used_parallelograms[num_parallelograms - 1] +=

src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_geometric_normal_decoder.h

@@ -151,6 +151,10 @@ bool MeshPredictionSchemeGeometricNormalDecoder<
     if (!buffer->Decode(&prediction_mode)) {
       return false;
     }
+    if (prediction_mode > TRIANGLE_AREA) {
+      // Invalid prediction mode.
+      return false;
+    }
 
     if (!predictor_.SetNormalPredictionMode(
             NormalPredictionMode(prediction_mode))) {

src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_predictor.h

@@ -169,15 +169,16 @@ bool MeshPredictionSchemeTexCoordsPortablePredictor<
       }
       const int64_t pn_uv_absmax_element =
           std::max(std::abs(pn_uv[0]), std::abs(pn_uv[1]));
-      if (cn_dot_pn >
+      if (std::abs(cn_dot_pn) >
           std::numeric_limits<int64_t>::max() / pn_uv_absmax_element) {
         // Return false if squared length calculation would overflow.
         return false;
       }
       const Vec2 x_uv = n_uv * pn_norm2_squared + (cn_dot_pn * pn_uv);
       const int64_t pn_absmax_element =
           std::max(std::max(std::abs(pn[0]), std::abs(pn[1])), std::abs(pn[2]));
-      if (cn_dot_pn > std::numeric_limits<int64_t>::max() / pn_absmax_element) {
+      if (std::abs(cn_dot_pn) >
+          std::numeric_limits<int64_t>::max() / pn_absmax_element) {
         // Return false if squared length calculation would overflow.
         return false;
       }

src/draco/compression/attributes/sequential_integer_attribute_decoder.cc

@@ -48,6 +48,11 @@ bool SequentialIntegerAttributeDecoder::DecodeValues(
   if (!in_buffer->Decode(&prediction_scheme_method)) {
     return false;
   }
+  // Check that decoded prediction scheme method type is valid.
+  if (prediction_scheme_method < PREDICTION_NONE ||
+      prediction_scheme_method >= NUM_PREDICTION_SCHEMES) {
+    return false;
+  }
   if (prediction_scheme_method != PREDICTION_NONE) {
     int8_t prediction_transform_type;
     if (!in_buffer->Decode(&prediction_transform_type)) {