Merge pull request #657 from google/v141_snapshot

Draco v1.4.1
google · Dec 8, 2020 · 07532d6 · 07532d6
2 parents 89f21de + 2e67b39
commit 07532d6
Show file tree

Hide file tree

Showing 34 changed files with 892 additions and 736 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,21 @@
-
 <p align="center">
 <img width="350px" src="docs/artwork/draco3d-vert.svg" />
 </p>
 
+![Build Status: master](https://travis-ci.org/google/draco.svg?branch=master)
+
 News
 =======
+### Version 1.4.1 release
+* Using the versioned gstatic.com WASM and Javascript decoders is now
+  recommended. To use v1.4.1, use this URL:
+  * https://www.gstatic.com/draco/versioned/decoders/1.4.1/*
+    * Replace the * with the files to load. E.g.
+    * https://gstatic.com/draco/versioned/decoders/1.4.1/draco_decoder.js
+  * This works with the v1.3.6 and v1.4.0 releases, and will work with future
+    Draco releases.
+* Bug fixes
+
 ### Version 1.4.0 release
 * WASM and JavaScript decoders are hosted from a static URL.
   * It is recommended to always pull your Draco WASM and JavaScript decoders from this URL:

diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake
@@ -332,7 +332,6 @@ macro(draco_add_library)
 
   # Determine if $lib_NAME is a header only target.
   unset(sources_list)
-
   if(lib_SOURCES)
     set(sources_list ${lib_SOURCES})
     list(FILTER sources_list INCLUDE REGEX cc$)

diff --git a/javascript/draco_decoder.js b/javascript/draco_decoder.js
diff --git a/javascript/draco_decoder.wasm b/javascript/draco_decoder.wasm
diff --git a/javascript/draco_decoder_gltf.js b/javascript/draco_decoder_gltf.js
diff --git a/javascript/draco_decoder_gltf.wasm b/javascript/draco_decoder_gltf.wasm
diff --git a/javascript/draco_encoder.js b/javascript/draco_encoder.js
diff --git a/javascript/draco_encoder.wasm b/javascript/draco_encoder.wasm
diff --git a/javascript/draco_encoder_wrapper.js b/javascript/draco_encoder_wrapper.js
diff --git a/javascript/draco_wasm_wrapper.js b/javascript/draco_wasm_wrapper.js
diff --git a/javascript/draco_wasm_wrapper_gltf.js b/javascript/draco_wasm_wrapper_gltf.js
diff --git a/javascript/example/README.md b/javascript/example/README.md
@@ -29,7 +29,7 @@ Static Loading Javascript Decoder
 ---------------------------------
 
 In the previous examples, `DRACOLoader.js` will dynamically load Javascript decoder or
-WASM decoder depending on the support of the browser. To avoid dynamical loading the decoder, e.g. to use with JS bundler like webpack, you could directly include `draco_decoder.js` and set the decoder type to `js`. For example:
+WASM decoder depending on the support of the browser. To avoid dynamically loading the decoder, e.g. to use with JS bundler like webpack, you could directly include `draco_decoder.js` and set the decoder type to `js`. For example:
 
 Include Javascript decoder:
 ~~~~~ html
@@ -39,7 +39,7 @@ Include Javascript decoder:
 Create DracoLoader by setting the decoder type:
 ~~~~~ js
 // (Optional) Change decoder source directory (defaults to
-// 'https://www.gstatic.com/draco/v1/decoders/'). It is recommended to always
+// 'https://www.gstatic.com/draco/versioned/decoders/1.4.1/'). 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.

diff --git a/javascript/example/webgl_loader_draco_advanced.html b/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/v1/decoders/');
+      dracoLoader.setDecoderPath('https://www.gstatic.com/draco/versioned/decoders/1.4.1/');
 
       var camera, cameraTarget, scene, renderer;
 

diff --git a/javascript/npm/draco3d/README.md b/javascript/npm/draco3d/README.md
@@ -6,7 +6,7 @@
 News
 =======
 
-Check out the [README](https://github.com/google/draco/blob/1.4.0/README.md)
+Check out the [README](https://github.com/google/draco/blob/1.4.1/README.md)
 file for news about this release.
 
 Description

diff --git a/javascript/npm/draco3d/draco_decoder.wasm b/javascript/npm/draco3d/draco_decoder.wasm
diff --git a/javascript/npm/draco3d/draco_decoder_nodejs.js b/javascript/npm/draco3d/draco_decoder_nodejs.js
diff --git a/javascript/npm/draco3d/draco_encoder.wasm b/javascript/npm/draco3d/draco_encoder.wasm
diff --git a/javascript/npm/draco3d/draco_encoder_nodejs.js b/javascript/npm/draco3d/draco_encoder_nodejs.js
diff --git a/javascript/npm/draco3d/package.json b/javascript/npm/draco3d/package.json
@@ -1,6 +1,6 @@
 {
   "name": "draco3d",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "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": {

diff --git a/javascript/npm/draco3dgltf/README.md b/javascript/npm/draco3dgltf/README.md
@@ -17,7 +17,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.4.0/README.md)
+Check out the [README](https://github.com/google/draco/blob/1.4.1/README.md)
 file for news about this release.
 
 NPM Package

diff --git a/javascript/npm/draco3dgltf/draco_decoder_gltf.wasm b/javascript/npm/draco3dgltf/draco_decoder_gltf.wasm
diff --git a/javascript/npm/draco3dgltf/draco_decoder_gltf_nodejs.js b/javascript/npm/draco3dgltf/draco_decoder_gltf_nodejs.js
diff --git a/javascript/npm/draco3dgltf/draco_encoder.wasm b/javascript/npm/draco3dgltf/draco_encoder.wasm
diff --git a/javascript/npm/draco3dgltf/draco_encoder_gltf_nodejs.js b/javascript/npm/draco3dgltf/draco_encoder_gltf_nodejs.js
diff --git a/javascript/npm/draco3dgltf/package.json b/javascript/npm/draco3dgltf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "draco3dgltf",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "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": {

diff --git a/javascript/time_draco_decode.html b/javascript/time_draco_decode.html
@@ -12,7 +12,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.
-let decoderPath = 'https://www.gstatic.com/draco/v1/decoders/';
+let decoderPath = 'https://www.gstatic.com/draco/versioned/decoders/1.4.1/';
 
 // This function loads a JavaScript file and adds it to the page. "path" is
 // the path to the JavaScript file. "onLoadFunc" is the function to be called

diff --git a/maya/draco_maya_wrapper_macos.tar.bz b/maya/draco_maya_wrapper_macos.tar.bz
diff --git a/maya/draco_maya_wrapper_windows.tar.bz b/maya/draco_maya_wrapper_windows.tar.bz
diff --git a/src/draco/core/draco_version.h b/src/draco/core/draco_version.h
@@ -18,7 +18,7 @@
 namespace draco {
 
 // Draco version is comprised of <major>.<minor>.<revision>.
-static const char kDracoVersion[] = "1.4.0";
+static const char kDracoVersion[] = "1.4.1";
 
 const char *Version() { return kDracoVersion; }
 

diff --git a/src/draco/mesh/mesh_are_equivalent_test.cc b/src/draco/mesh/mesh_are_equivalent_test.cc
@@ -63,7 +63,6 @@ TEST_F(MeshAreEquivalentTest, TestPermutedTwoFaces) {
   ASSERT_TRUE(equiv(*mesh_0, *mesh_1));
 }
 
-//
 TEST_F(MeshAreEquivalentTest, TestPermutedThreeFaces) {
   const std::string file_name_0 = "three_faces_123.obj";
   const std::string file_name_1 = "three_faces_312.obj";

diff --git a/unity/Plugin/libdracodec_unity_android.tar.bz b/unity/Plugin/libdracodec_unity_android.tar.bz
diff --git a/unity/Plugin/libdracodec_unity_ios.tar.bz b/unity/Plugin/libdracodec_unity_ios.tar.bz
diff --git a/unity/Plugin/libdracodec_unity_macos.tar.bz b/unity/Plugin/libdracodec_unity_macos.tar.bz
diff --git a/unity/Plugin/libdracodec_unity_windows.tar.bz b/unity/Plugin/libdracodec_unity_windows.tar.bz