From 437958ef91920bde96ebd8481540406a33aaa947 Mon Sep 17 00:00:00 2001
From: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
Date: Sat, 25 Feb 2023 10:10:35 +0800
Subject: [PATCH 01/61] bugfix fails to check if point in triangle.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
---
code/Common/PolyTools.h | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/code/Common/PolyTools.h b/code/Common/PolyTools.h
index 9837a2991..a5bd1090b 100644
--- a/code/Common/PolyTools.h
+++ b/code/Common/PolyTools.h
@@ -74,26 +74,8 @@ inline bool OnLeftSideOfLine2D(const T& p0, const T& p1,const T& p2) {
* both aiVector3D and aiVector2D, but generally ignores the third coordinate.*/
template
inline bool PointInTriangle2D(const T& p0, const T& p1,const T& p2, const T& pp) {
- // Point in triangle test using baryzentric coordinates
- const aiVector2D v0 = p1 - p0;
- const aiVector2D v1 = p2 - p0;
- const aiVector2D v2 = pp - p0;
-
- double dot00 = v0 * v0;
- double dot11 = v1 * v1;
- const double dot01 = v0 * v1;
- const double dot02 = v0 * v2;
- const double dot12 = v1 * v2;
- const double denom = dot00 * dot11 - dot01 * dot01;
- if (denom == 0.0) {
- return false;
- }
-
- const double invDenom = 1.0 / denom;
- dot11 = (dot11 * dot02 - dot01 * dot12) * invDenom;
- dot00 = (dot00 * dot12 - dot01 * dot02) * invDenom;
-
- return (dot11 > 0) && (dot00 > 0) && (dot11 + dot00 < 1);
+ // pp should be left side of the three triangle side, by ccw arrow
+ return OnLeftSideOfLine2D(p0, p1, pp) && OnLeftSideOfLine2D(p1, p2, pp) && OnLeftSideOfLine2D(p2, p0, pp);
}
From 94d977354804608d29281a7e3e940b71aa148865 Mon Sep 17 00:00:00 2001
From: FeeshWyvern
Date: Mon, 27 Feb 2023 20:02:34 -0800
Subject: [PATCH 02/61] Bug fix: Correctly set the name of the attributes. PR
#3940 did not seem to update in Master?
---
port/PyAssimp/pyassimp/core.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/port/PyAssimp/pyassimp/core.py b/port/PyAssimp/pyassimp/core.py
index 35ad882b3..37beac886 100644
--- a/port/PyAssimp/pyassimp/core.py
+++ b/port/PyAssimp/pyassimp/core.py
@@ -211,7 +211,7 @@ def _init(self, target = None, parent = None):
else: # starts with 'm' but not iterable
- setattr(target, m, obj)
+ setattr(target, name, obj)
logger.debug("Added " + name + " as self." + name + " (type: " + str(type(obj)) + ")")
if _is_init_type(obj):
From f9fcf33aaa639fbfd386631cb796ac66d01fef94 Mon Sep 17 00:00:00 2001
From: FeeshWyvern
Date: Mon, 27 Feb 2023 20:06:05 -0800
Subject: [PATCH 03/61] Bug fix: We should not be accessing `mPrivate`
according to structs.Scene and fixes a crash when `mPrivate` points to
invalid data.
---
port/PyAssimp/pyassimp/core.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/port/PyAssimp/pyassimp/core.py b/port/PyAssimp/pyassimp/core.py
index 37beac886..edde8b29a 100644
--- a/port/PyAssimp/pyassimp/core.py
+++ b/port/PyAssimp/pyassimp/core.py
@@ -115,6 +115,10 @@ def _init(self, target = None, parent = None):
if m.startswith("_"):
continue
+ # We should not be accessing `mPrivate` according to structs.Scene.
+ if m == 'mPrivate':
+ continue
+
if m.startswith('mNum'):
if 'm' + m[4:] in dirself:
continue # will be processed later on
From a1aace74e58460d0d5c6462cea81682b5647e4b7 Mon Sep 17 00:00:00 2001
From: Kim Kulling
Date: Tue, 28 Feb 2023 21:53:18 +0100
Subject: [PATCH 04/61] Fix: Use C++17 compliant utf8 encoding.
---
samples/SharedCode/UTFConverter.cpp | 2 +-
samples/SharedCode/UTFConverter.h | 43 ++++++++++++++++++-----------
2 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/samples/SharedCode/UTFConverter.cpp b/samples/SharedCode/UTFConverter.cpp
index a1bff7e4b..e6c07e946 100644
--- a/samples/SharedCode/UTFConverter.cpp
+++ b/samples/SharedCode/UTFConverter.cpp
@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace AssimpSamples {
namespace SharedCode {
-typename UTFConverter::UTFConverterImpl UTFConverter::impl_;
+//typename UTFConverter::UTFConverterImpl UTFConverter::impl_;
}
}
diff --git a/samples/SharedCode/UTFConverter.h b/samples/SharedCode/UTFConverter.h
index 17e89ee4d..34b2293de 100644
--- a/samples/SharedCode/UTFConverter.h
+++ b/samples/SharedCode/UTFConverter.h
@@ -45,43 +45,54 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define ASSIMP_SAMPLES_SHARED_CODE_UTFCONVERTER_H
#include
-#include
-#include
+#include
+
+#ifdef ASSIMP_USE_HUNTER
+#include
+#else
+#include "../contrib/utf8cpp/source/utf8.h"
+#endif
namespace AssimpSamples {
namespace SharedCode {
// Used to convert between multibyte and unicode strings.
class UTFConverter {
- using UTFConverterImpl = std::wstring_convert, wchar_t>;
public:
- UTFConverter(const char* s) :
- s_(s),
- ws_(impl_.from_bytes(s)) {
+ //utf8::utf16to8(start, end, back_inserter(str));
+
+ UTFConverter(const char* s) : s_(s), ws_() {
+ std::vector str;
+ utf8::utf8to16(s, s + std::strlen(s) + 1, back_inserter(str));
}
- UTFConverter(const wchar_t* s) :
- s_(impl_.to_bytes(s)),
- ws_(s) {
+
+ UTFConverter(const wchar_t* s) : s_(),ws_(s) {
+ std::vector str;
+ utf8::utf16to8(s, s + ws_.size() + 1, back_inserter(str));
}
- UTFConverter(const std::string& s) :
- s_(s),
- ws_(impl_.from_bytes(s)) {
+
+ UTFConverter(const std::string& s) : s_(s), ws_() {
+ std::vector str;
+ utf8::utf8to16(s.c_str(), s.c_str() + s.size() + 1, back_inserter(str));
}
- UTFConverter(const std::wstring& s) :
- s_(impl_.to_bytes(s)),
- ws_(s) {
+
+ UTFConverter(const std::wstring& s) : s_(), ws_(s) {
+ std::vector str;
+ utf8::utf16to8(s.c_str(), s.c_str() + ws_.size() + 1, back_inserter(str));
}
+
inline const char* c_str() const {
return s_.c_str();
}
+
inline const std::string& str() const {
return s_;
}
+
inline const wchar_t* c_wstr() const {
return ws_.c_str();
}
private:
- static UTFConverterImpl impl_;
std::string s_;
std::wstring ws_;
};
From 60da5e7e963d5753a5a532cea1ff78600cf8185f Mon Sep 17 00:00:00 2001
From: Kim Kulling
Date: Tue, 28 Feb 2023 23:27:46 +0100
Subject: [PATCH 05/61] Update UTFConverter.cpp
---
samples/SharedCode/UTFConverter.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/samples/SharedCode/UTFConverter.cpp b/samples/SharedCode/UTFConverter.cpp
index e6c07e946..383ae43f1 100644
--- a/samples/SharedCode/UTFConverter.cpp
+++ b/samples/SharedCode/UTFConverter.cpp
@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
Copyright (c) 2006-2020, assimp team
-
-
All rights reserved.
Redistribution and use of this software in source and binary forms,
@@ -46,7 +44,5 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace AssimpSamples {
namespace SharedCode {
-//typename UTFConverter::UTFConverterImpl UTFConverter::impl_;
-
}
}
From 534ee288c5d5864f871a924a44ef5462c2acf435 Mon Sep 17 00:00:00 2001
From: Kim Kulling
Date: Tue, 28 Feb 2023 23:28:24 +0100
Subject: [PATCH 06/61] Update UTFConverter.h
---
samples/SharedCode/UTFConverter.h | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/samples/SharedCode/UTFConverter.h b/samples/SharedCode/UTFConverter.h
index 34b2293de..8173d474c 100644
--- a/samples/SharedCode/UTFConverter.h
+++ b/samples/SharedCode/UTFConverter.h
@@ -3,9 +3,7 @@
Open Asset Import Library (assimp)
---------------------------------------------------------------------------
-Copyright (c) 2006-2020, assimp team
-
-
+Copyright (c) 2006-2023, assimp team
All rights reserved.
@@ -56,11 +54,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace AssimpSamples {
namespace SharedCode {
-// Used to convert between multibyte and unicode strings.
+/// @brief Used to convert between multibyte and unicode strings.
class UTFConverter {
public:
- //utf8::utf16to8(start, end, back_inserter(str));
-
UTFConverter(const char* s) : s_(s), ws_() {
std::vector str;
utf8::utf8to16(s, s + std::strlen(s) + 1, back_inserter(str));
From 39efe4c832c02e8e6560b9922b0504716fd3c99c Mon Sep 17 00:00:00 2001
From: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
Date: Sat, 25 Feb 2023 10:11:35 +0800
Subject: [PATCH 07/61] upgrade draco to 1.5.6
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
---
contrib/draco/.cmake-format.py | 217 +-
contrib/draco/.gitattributes | 1 +
contrib/draco/.gitmodules | 12 +
contrib/draco/BUILDING.md | 86 +-
contrib/draco/CMakeLists.txt | 1193 +++---
contrib/draco/README.md | 150 +-
contrib/draco/cmake/DracoConfig.cmake | 3 -
contrib/draco/cmake/FindDraco.cmake | 56 -
contrib/draco/cmake/compiler_flags.cmake | 220 -
contrib/draco/cmake/compiler_tests.cmake | 103 -
.../draco/cmake/draco-config.cmake.template | 5 +-
contrib/draco/cmake/draco.pc.template | 9 +-
.../draco/cmake/draco_build_definitions.cmake | 79 +-
contrib/draco/cmake/draco_cpu_detection.cmake | 14 +
contrib/draco/cmake/draco_dependencies.cmake | 136 +
contrib/draco/cmake/draco_emscripten.cmake | 177 +-
contrib/draco/cmake/draco_flags.cmake | 51 +-
contrib/draco/cmake/draco_helpers.cmake | 14 +
contrib/draco/cmake/draco_install.cmake | 126 +-
contrib/draco/cmake/draco_intrinsics.cmake | 34 +-
contrib/draco/cmake/draco_options.cmake | 185 +-
contrib/draco/cmake/draco_sanitizer.cmake | 22 +-
contrib/draco/cmake/draco_targets.cmake | 147 +-
contrib/draco/cmake/draco_test_config.h.cmake | 15 +
contrib/draco/cmake/draco_tests.cmake | 154 +-
contrib/draco/cmake/draco_variables.cmake | 29 +-
contrib/draco/cmake/sanitizers.cmake | 19 -
.../cmake/toolchains/aarch64-linux-gnu.cmake | 14 +
.../cmake/toolchains/android-ndk-common.cmake | 14 +
contrib/draco/cmake/toolchains/android.cmake | 20 +-
.../cmake/toolchains/arm-ios-common.cmake | 16 +-
.../toolchains/arm-linux-gnueabihf.cmake | 14 +
.../toolchains/arm64-android-ndk-libcpp.cmake | 14 +
.../draco/cmake/toolchains/arm64-ios.cmake | 15 +-
.../cmake/toolchains/arm64-linux-gcc.cmake | 14 +
.../toolchains/armv7-android-ndk-libcpp.cmake | 14 +
.../draco/cmake/toolchains/armv7-ios.cmake | 15 +-
.../cmake/toolchains/armv7-linux-gcc.cmake | 14 +
.../draco/cmake/toolchains/armv7s-ios.cmake | 15 +-
contrib/draco/cmake/toolchains/i386-ios.cmake | 15 +-
.../toolchains/x86-android-ndk-libcpp.cmake | 14 +
.../x86_64-android-ndk-libcpp.cmake | 14 +
.../draco/cmake/toolchains/x86_64-ios.cmake | 15 +-
contrib/draco/cmake/util.cmake | 79 -
.../draco/src/draco/animation/animation.cc | 47 +
contrib/draco/src/draco/animation/animation.h | 149 +
.../src/draco/animation/animation_test.cc | 71 +
.../keyframe_animation_encoding_test.cc | 17 +-
.../animation/keyframe_animation_test.cc | 6 +-
.../src/draco/animation/node_animation_data.h | 150 +
contrib/draco/src/draco/animation/skin.cc | 29 +
contrib/draco/src/draco/animation/skin.h | 64 +
.../draco/attributes/attribute_transform.cc | 7 +-
.../draco/attributes/geometry_attribute.cc | 2 +-
.../src/draco/attributes/geometry_attribute.h | 225 +-
.../src/draco/attributes/point_attribute.cc | 43 +
.../src/draco/attributes/point_attribute.h | 6 +
.../attributes/attributes_encoder.cc | 16 +-
.../attributes/kd_tree_attributes_decoder.cc | 73 +-
.../attributes/kd_tree_attributes_decoder.h | 4 +
.../attributes/normal_compression_utils.h | 38 +-
.../compression/attributes/point_d_vector.h | 12 +-
..._constrained_multi_parallelogram_decoder.h | 7 +-
..._constrained_multi_parallelogram_encoder.h | 2 +-
...ction_scheme_multi_parallelogram_decoder.h | 4 +-
...esh_prediction_scheme_tex_coords_decoder.h | 58 +-
...ction_scheme_tex_coords_portable_encoder.h | 5 +-
...ion_scheme_tex_coords_portable_predictor.h | 64 +-
.../prediction_scheme_encoder_factory.cc | 53 +-
.../prediction_scheme_encoder_factory.h | 7 +-
...ahedron_canonicalized_decoding_transform.h | 6 +-
...octahedron_canonicalized_transform_test.cc | 10 +-
...eme_normal_octahedron_decoding_transform.h | 18 +-
...scheme_normal_octahedron_transform_test.cc | 8 +-
.../prediction_scheme_wrap_transform_base.h | 4 +-
.../sequential_integer_attribute_decoder.cc | 10 +-
.../sequential_integer_attribute_encoder.cc | 8 +-
.../sequential_normal_attribute_encoder.cc | 3 +-
.../bit_coders/direct_bit_decoder.h | 9 +-
.../compression/config/encoder_options.h | 4 +
.../src/draco/compression/decode_test.cc | 76 +
.../compression/draco_compression_options.cc | 59 +
.../compression/draco_compression_options.h | 141 +
.../draco_compression_options_test.cc | 45 +
contrib/draco/src/draco/compression/encode.h | 1 -
.../draco/src/draco/compression/encode_base.h | 2 +-
.../src/draco/compression/encode_test.cc | 187 +-
.../draco/src/draco/compression/entropy/ans.h | 1 -
.../compression/entropy/rans_symbol_decoder.h | 7 +
.../compression/entropy/rans_symbol_encoder.h | 4 +-
.../compression/entropy/symbol_decoding.cc | 2 +-
.../src/draco/compression/expert_encode.cc | 118 +
.../src/draco/compression/expert_encode.h | 6 +
.../mesh/mesh_edgebreaker_decoder_impl.cc | 54 +-
.../mesh/mesh_edgebreaker_encoder.cc | 1 -
.../mesh/mesh_edgebreaker_encoder_impl.cc | 2 +-
.../mesh/mesh_edgebreaker_encoder_impl.h | 1 -
.../mesh/mesh_edgebreaker_encoding_test.cc | 27 +-
.../mesh/mesh_edgebreaker_shared.h | 2 -
...sh_edgebreaker_traversal_valence_decoder.h | 6 +-
.../compression/mesh/mesh_encoder_test.cc | 8 +-
.../mesh/mesh_sequential_decoder.cc | 6 +-
.../mesh/mesh_sequential_encoder.cc | 4 -
.../mesh/mesh_sequential_encoder.h | 1 -
...mesh_attribute_indices_encoding_observer.h | 2 +-
.../mesh/traverser/mesh_traversal_sequencer.h | 2 +-
.../dynamic_integer_points_kd_tree_decoder.h | 53 +-
.../dynamic_integer_points_kd_tree_encoder.h | 5 +-
.../algorithms/float_points_tree_encoder.h | 4 +-
.../integer_points_kd_tree_decoder.h | 3 +-
.../integer_points_kd_tree_encoder.h | 3 +-
.../algorithms/quantize_points_3.h | 6 +-
.../point_cloud_kd_tree_encoding_test.cc | 4 +-
contrib/draco/src/draco/core/bounding_box.cc | 15 +-
contrib/draco/src/draco/core/bounding_box.h | 5 +
contrib/draco/src/draco/core/constants.h | 6 +
contrib/draco/src/draco/core/data_buffer.cc | 2 +-
contrib/draco/src/draco/core/data_buffer.h | 2 +-
contrib/draco/src/draco/core/decoder_buffer.h | 14 +-
.../src/draco/core/draco_index_type_vector.h | 15 +-
.../draco/src/draco/core/draco_test_utils.cc | 26 +-
.../draco/src/draco/core/draco_test_utils.h | 53 +
contrib/draco/src/draco/core/draco_version.h | 4 +-
contrib/draco/src/draco/core/macros.h | 21 +-
contrib/draco/src/draco/core/math_utils.h | 24 +
.../draco/src/draco/core/math_utils_test.cc | 4 +-
contrib/draco/src/draco/core/options.cc | 3 +-
contrib/draco/src/draco/core/options.h | 7 +-
contrib/draco/src/draco/core/status.cc | 44 +
contrib/draco/src/draco/core/status.h | 6 +
contrib/draco/src/draco/core/status_test.cc | 7 +
contrib/draco/src/draco/core/vector_d.h | 6 +-
contrib/draco/src/draco/core/vector_d_test.cc | 60 -
.../draco/src/draco/io/file_reader_factory.cc | 2 +-
contrib/draco/src/draco/io/file_utils.cc | 37 +-
contrib/draco/src/draco/io/file_utils.h | 15 +-
contrib/draco/src/draco/io/file_utils_test.cc | 2 +
.../draco/src/draco/io/file_writer_factory.cc | 1 +
.../draco/src/draco/io/file_writer_utils.cc | 21 +-
.../src/draco/io/file_writer_utils_test.cc | 49 +
contrib/draco/src/draco/io/gltf_decoder.cc | 2893 +++++++++++++
contrib/draco/src/draco/io/gltf_decoder.h | 524 +++
.../draco/src/draco/io/gltf_decoder_test.cc | 1402 +++++++
contrib/draco/src/draco/io/gltf_encoder.cc | 3662 +++++++++++++++++
contrib/draco/src/draco/io/gltf_encoder.h | 134 +
.../draco/src/draco/io/gltf_encoder_test.cc | 1717 ++++++++
.../draco/src/draco/io/gltf_test_helper.cc | 823 ++++
contrib/draco/src/draco/io/gltf_test_helper.h | 61 +
contrib/draco/src/draco/io/gltf_utils.cc | 154 +
contrib/draco/src/draco/io/gltf_utils.h | 186 +
contrib/draco/src/draco/io/gltf_utils_test.cc | 366 ++
.../src/draco/io/image_compression_options.h | 31 +
contrib/draco/src/draco/io/mesh_io.cc | 33 +-
contrib/draco/src/draco/io/obj_decoder.cc | 132 +-
contrib/draco/src/draco/io/obj_decoder.h | 22 +-
.../draco/src/draco/io/obj_decoder_test.cc | 128 +-
contrib/draco/src/draco/io/obj_encoder.cc | 169 +-
contrib/draco/src/draco/io/obj_encoder.h | 15 +
.../draco/src/draco/io/obj_encoder_test.cc | 34 +
contrib/draco/src/draco/io/parser_utils.cc | 43 +-
.../draco/src/draco/io/ply_decoder_test.cc | 1 +
contrib/draco/src/draco/io/ply_encoder.cc | 13 +-
contrib/draco/src/draco/io/ply_reader_test.cc | 10 +-
contrib/draco/src/draco/io/scene_io.cc | 127 +
contrib/draco/src/draco/io/scene_io.h | 55 +
contrib/draco/src/draco/io/scene_io_test.cc | 86 +
.../src/draco/io/stdio_file_reader_test.cc | 2 +-
contrib/draco/src/draco/io/stl_decoder.cc | 77 +
contrib/draco/src/draco/io/stl_decoder.h | 38 +
.../draco/src/draco/io/stl_decoder_test.cc | 49 +
contrib/draco/src/draco/io/stl_encoder.cc | 111 +
contrib/draco/src/draco/io/stl_encoder.h | 52 +
.../draco/src/draco/io/stl_encoder_test.cc | 78 +
contrib/draco/src/draco/io/texture_io.cc | 94 +
contrib/draco/src/draco/io/texture_io.h | 56 +
contrib/draco/src/draco/io/texture_io_test.cc | 55 +
contrib/draco/src/draco/io/tiny_gltf_utils.cc | 230 ++
contrib/draco/src/draco/io/tiny_gltf_utils.h | 140 +
.../animation_decoder_webidl_wrapper.cc | 101 -
.../animation_decoder_webidl_wrapper.h | 73 -
.../animation_encoder_webidl_wrapper.cc | 89 -
.../animation_encoder_webidl_wrapper.h | 66 -
.../emscripten/decoder_webidl_wrapper.cc | 12 +-
.../draco_animation_decoder_glue_wrapper.cc | 28 -
.../draco_animation_web_decoder.idl | 52 -
.../draco_animation_web_encoder.idl | 34 -
.../draco/javascript/emscripten/version.js | 2 +-
contrib/draco/src/draco/material/material.cc | 258 ++
contrib/draco/src/draco/material/material.h | 276 ++
.../src/draco/material/material_library.cc | 125 +
.../src/draco/material/material_library.h | 104 +
.../draco/material/material_library_test.cc | 155 +
.../draco/src/draco/material/material_test.cc | 320 ++
.../src/draco/material/material_utils.cc | 14 +
.../draco/src/draco/material/material_utils.h | 14 +
.../src/draco/material/material_utils_test.cc | 24 +
contrib/draco/src/draco/mesh/corner_table.cc | 1 +
contrib/draco/src/draco/mesh/corner_table.h | 1 +
.../src/draco/mesh/corner_table_iterators.h | 32 +-
.../draco/src/draco/mesh/corner_table_test.cc | 126 +
contrib/draco/src/draco/mesh/mesh.cc | 433 ++
contrib/draco/src/draco/mesh/mesh.h | 180 +
.../src/draco/mesh/mesh_are_equivalent.cc | 52 +
.../draco/mesh/mesh_are_equivalent_test.cc | 37 +
.../draco/mesh/mesh_attribute_corner_table.cc | 14 +-
.../draco/mesh/mesh_attribute_corner_table.h | 10 +-
contrib/draco/src/draco/mesh/mesh_cleanup.cc | 12 +-
contrib/draco/src/draco/mesh/mesh_cleanup.h | 16 +-
.../draco/src/draco/mesh/mesh_cleanup_test.cc | 16 +-
.../draco/mesh/mesh_connected_components.h | 161 +
contrib/draco/src/draco/mesh/mesh_features.cc | 98 +
contrib/draco/src/draco/mesh/mesh_features.h | 93 +
.../src/draco/mesh/mesh_features_test.cc | 98 +
contrib/draco/src/draco/mesh/mesh_indices.h | 37 +
.../src/draco/mesh/mesh_misc_functions.h | 1 -
contrib/draco/src/draco/mesh/mesh_splitter.cc | 451 ++
contrib/draco/src/draco/mesh/mesh_splitter.h | 109 +
.../mesh_splitter_test.cc} | 23 +-
.../draco/src/draco/mesh/mesh_stripifier.h | 2 -
contrib/draco/src/draco/mesh/mesh_test.cc | 644 +++
contrib/draco/src/draco/mesh/mesh_utils.cc | 492 +++
contrib/draco/src/draco/mesh/mesh_utils.h | 102 +
.../draco/src/draco/mesh/mesh_utils_test.cc | 391 ++
.../draco/mesh/triangle_soup_mesh_builder.cc | 16 +-
.../draco/mesh/triangle_soup_mesh_builder.h | 63 +
.../mesh/triangle_soup_mesh_builder_test.cc | 72 +-
.../src/draco/metadata/geometry_metadata.cc | 15 +-
.../src/draco/metadata/geometry_metadata.h | 2 +
contrib/draco/src/draco/metadata/metadata.cc | 8 +
contrib/draco/src/draco/metadata/metadata.h | 1 +
.../src/draco/metadata/metadata_decoder.cc | 21 +-
.../draco/src/draco/metadata/metadata_test.cc | 6 +-
.../src/draco/metadata/property_table.cc | 183 +
.../draco/src/draco/metadata/property_table.h | 243 ++
.../src/draco/metadata/property_table_test.cc | 624 +++
.../src/draco/metadata/structural_metadata.cc | 74 +
.../src/draco/metadata/structural_metadata.h | 64 +
.../metadata/structural_metadata_test.cc | 170 +
.../src/draco/point_cloud/point_cloud.cc | 39 +-
.../draco/src/draco/point_cloud/point_cloud.h | 10 +
.../draco/point_cloud/point_cloud_builder.cc | 2 +
.../draco/point_cloud/point_cloud_builder.h | 11 +
.../src/draco/point_cloud/point_cloud_test.cc | 54 +
.../draco/src/draco/scene/instance_array.cc | 45 +
.../draco/src/draco/scene/instance_array.h | 61 +
.../src/draco/scene/instance_array_test.cc | 179 +
contrib/draco/src/draco/scene/light.cc | 45 +
contrib/draco/src/draco/scene/light.h | 81 +
contrib/draco/src/draco/scene/light_test.cc | 64 +
contrib/draco/src/draco/scene/mesh_group.h | 138 +
.../draco/src/draco/scene/mesh_group_test.cc | 196 +
contrib/draco/src/draco/scene/scene.cc | 174 +
contrib/draco/src/draco/scene/scene.h | 258 ++
.../src/draco/scene/scene_are_equivalent.cc | 109 +
.../src/draco/scene/scene_are_equivalent.h | 42 +
.../draco/scene/scene_are_equivalent_test.cc | 86 +
contrib/draco/src/draco/scene/scene_indices.h | 72 +
contrib/draco/src/draco/scene/scene_node.h | 105 +
contrib/draco/src/draco/scene/scene_test.cc | 295 ++
contrib/draco/src/draco/scene/scene_utils.cc | 962 +++++
contrib/draco/src/draco/scene/scene_utils.h | 150 +
.../draco/src/draco/scene/scene_utils_test.cc | 763 ++++
contrib/draco/src/draco/scene/trs_matrix.cc | 102 +
contrib/draco/src/draco/scene/trs_matrix.h | 124 +
.../draco/src/draco/scene/trs_matrix_test.cc | 79 +
.../draco/src/draco/texture/source_image.cc | 29 +
.../draco/src/draco/texture/source_image.h | 72 +
contrib/draco/src/draco/texture/texture.h | 46 +
.../src/draco/texture/texture_library.cc | 61 +
.../draco/src/draco/texture/texture_library.h | 67 +
.../src/draco/texture/texture_library_test.cc | 22 +
.../draco/src/draco/texture/texture_map.cc | 86 +
contrib/draco/src/draco/texture/texture_map.h | 175 +
.../src/draco/texture/texture_map_test.cc | 0
.../src/draco/texture/texture_transform.cc | 79 +
.../src/draco/texture/texture_transform.h | 75 +
.../draco/texture/texture_transform_test.cc | 0
.../draco/src/draco/texture/texture_utils.cc | 144 +
.../draco/src/draco/texture/texture_utils.h | 78 +
.../src/draco/texture/texture_utils_test.cc | 163 +
.../draco/src/draco/tools/draco_decoder.cc | 20 +-
.../draco/src/draco/tools/draco_encoder.cc | 59 +-
.../draco/src/draco/tools/draco_transcoder.cc | 130 +
.../src/draco/tools/draco_transcoder_lib.cc | 86 +
.../src/draco/tools/draco_transcoder_lib.h | 103 +
.../draco/tools/draco_transcoder_lib_test.cc | 172 +
contrib/draco/src/draco/tools/fuzz/build.sh | 2 +-
.../draco/tools/install_test/CMakeLists.txt | 25 +
.../src/draco/tools/install_test/main.cc | 44 +
.../src/draco/tools/install_test/test.py | 456 ++
290 files changed, 30940 insertions(+), 2350 deletions(-)
create mode 100644 contrib/draco/.gitattributes
create mode 100644 contrib/draco/.gitmodules
delete mode 100644 contrib/draco/cmake/DracoConfig.cmake
delete mode 100644 contrib/draco/cmake/FindDraco.cmake
delete mode 100644 contrib/draco/cmake/compiler_flags.cmake
delete mode 100644 contrib/draco/cmake/compiler_tests.cmake
create mode 100644 contrib/draco/cmake/draco_dependencies.cmake
delete mode 100644 contrib/draco/cmake/sanitizers.cmake
delete mode 100644 contrib/draco/cmake/util.cmake
create mode 100644 contrib/draco/src/draco/animation/animation.cc
create mode 100644 contrib/draco/src/draco/animation/animation.h
create mode 100644 contrib/draco/src/draco/animation/animation_test.cc
create mode 100644 contrib/draco/src/draco/animation/node_animation_data.h
create mode 100644 contrib/draco/src/draco/animation/skin.cc
create mode 100644 contrib/draco/src/draco/animation/skin.h
create mode 100644 contrib/draco/src/draco/compression/draco_compression_options.cc
create mode 100644 contrib/draco/src/draco/compression/draco_compression_options.h
create mode 100644 contrib/draco/src/draco/compression/draco_compression_options_test.cc
create mode 100644 contrib/draco/src/draco/core/constants.h
create mode 100644 contrib/draco/src/draco/core/status.cc
create mode 100644 contrib/draco/src/draco/io/file_writer_utils_test.cc
create mode 100644 contrib/draco/src/draco/io/gltf_decoder.cc
create mode 100644 contrib/draco/src/draco/io/gltf_decoder.h
create mode 100644 contrib/draco/src/draco/io/gltf_decoder_test.cc
create mode 100644 contrib/draco/src/draco/io/gltf_encoder.cc
create mode 100644 contrib/draco/src/draco/io/gltf_encoder.h
create mode 100644 contrib/draco/src/draco/io/gltf_encoder_test.cc
create mode 100644 contrib/draco/src/draco/io/gltf_test_helper.cc
create mode 100644 contrib/draco/src/draco/io/gltf_test_helper.h
create mode 100644 contrib/draco/src/draco/io/gltf_utils.cc
create mode 100644 contrib/draco/src/draco/io/gltf_utils.h
create mode 100644 contrib/draco/src/draco/io/gltf_utils_test.cc
create mode 100644 contrib/draco/src/draco/io/image_compression_options.h
create mode 100644 contrib/draco/src/draco/io/scene_io.cc
create mode 100644 contrib/draco/src/draco/io/scene_io.h
create mode 100644 contrib/draco/src/draco/io/scene_io_test.cc
create mode 100644 contrib/draco/src/draco/io/stl_decoder.cc
create mode 100644 contrib/draco/src/draco/io/stl_decoder.h
create mode 100644 contrib/draco/src/draco/io/stl_decoder_test.cc
create mode 100644 contrib/draco/src/draco/io/stl_encoder.cc
create mode 100644 contrib/draco/src/draco/io/stl_encoder.h
create mode 100644 contrib/draco/src/draco/io/stl_encoder_test.cc
create mode 100644 contrib/draco/src/draco/io/texture_io.cc
create mode 100644 contrib/draco/src/draco/io/texture_io.h
create mode 100644 contrib/draco/src/draco/io/texture_io_test.cc
create mode 100644 contrib/draco/src/draco/io/tiny_gltf_utils.cc
create mode 100644 contrib/draco/src/draco/io/tiny_gltf_utils.h
delete mode 100644 contrib/draco/src/draco/javascript/emscripten/animation_decoder_webidl_wrapper.cc
delete mode 100644 contrib/draco/src/draco/javascript/emscripten/animation_decoder_webidl_wrapper.h
delete mode 100644 contrib/draco/src/draco/javascript/emscripten/animation_encoder_webidl_wrapper.cc
delete mode 100644 contrib/draco/src/draco/javascript/emscripten/animation_encoder_webidl_wrapper.h
delete mode 100644 contrib/draco/src/draco/javascript/emscripten/draco_animation_decoder_glue_wrapper.cc
delete mode 100644 contrib/draco/src/draco/javascript/emscripten/draco_animation_web_decoder.idl
delete mode 100644 contrib/draco/src/draco/javascript/emscripten/draco_animation_web_encoder.idl
create mode 100644 contrib/draco/src/draco/material/material.cc
create mode 100644 contrib/draco/src/draco/material/material.h
create mode 100644 contrib/draco/src/draco/material/material_library.cc
create mode 100644 contrib/draco/src/draco/material/material_library.h
create mode 100644 contrib/draco/src/draco/material/material_library_test.cc
create mode 100644 contrib/draco/src/draco/material/material_test.cc
create mode 100644 contrib/draco/src/draco/material/material_utils.cc
create mode 100644 contrib/draco/src/draco/material/material_utils.h
create mode 100644 contrib/draco/src/draco/material/material_utils_test.cc
create mode 100644 contrib/draco/src/draco/mesh/corner_table_test.cc
create mode 100644 contrib/draco/src/draco/mesh/mesh_connected_components.h
create mode 100644 contrib/draco/src/draco/mesh/mesh_features.cc
create mode 100644 contrib/draco/src/draco/mesh/mesh_features.h
create mode 100644 contrib/draco/src/draco/mesh/mesh_features_test.cc
create mode 100644 contrib/draco/src/draco/mesh/mesh_indices.h
create mode 100644 contrib/draco/src/draco/mesh/mesh_splitter.cc
create mode 100644 contrib/draco/src/draco/mesh/mesh_splitter.h
rename contrib/draco/src/draco/{javascript/emscripten/draco_animation_encoder_glue_wrapper.cc => mesh/mesh_splitter_test.cc} (51%)
create mode 100644 contrib/draco/src/draco/mesh/mesh_test.cc
create mode 100644 contrib/draco/src/draco/mesh/mesh_utils.cc
create mode 100644 contrib/draco/src/draco/mesh/mesh_utils.h
create mode 100644 contrib/draco/src/draco/mesh/mesh_utils_test.cc
create mode 100644 contrib/draco/src/draco/metadata/property_table.cc
create mode 100644 contrib/draco/src/draco/metadata/property_table.h
create mode 100644 contrib/draco/src/draco/metadata/property_table_test.cc
create mode 100644 contrib/draco/src/draco/metadata/structural_metadata.cc
create mode 100644 contrib/draco/src/draco/metadata/structural_metadata.h
create mode 100644 contrib/draco/src/draco/metadata/structural_metadata_test.cc
create mode 100644 contrib/draco/src/draco/scene/instance_array.cc
create mode 100644 contrib/draco/src/draco/scene/instance_array.h
create mode 100644 contrib/draco/src/draco/scene/instance_array_test.cc
create mode 100644 contrib/draco/src/draco/scene/light.cc
create mode 100644 contrib/draco/src/draco/scene/light.h
create mode 100644 contrib/draco/src/draco/scene/light_test.cc
create mode 100644 contrib/draco/src/draco/scene/mesh_group.h
create mode 100644 contrib/draco/src/draco/scene/mesh_group_test.cc
create mode 100644 contrib/draco/src/draco/scene/scene.cc
create mode 100644 contrib/draco/src/draco/scene/scene.h
create mode 100644 contrib/draco/src/draco/scene/scene_are_equivalent.cc
create mode 100644 contrib/draco/src/draco/scene/scene_are_equivalent.h
create mode 100644 contrib/draco/src/draco/scene/scene_are_equivalent_test.cc
create mode 100644 contrib/draco/src/draco/scene/scene_indices.h
create mode 100644 contrib/draco/src/draco/scene/scene_node.h
create mode 100644 contrib/draco/src/draco/scene/scene_test.cc
create mode 100644 contrib/draco/src/draco/scene/scene_utils.cc
create mode 100644 contrib/draco/src/draco/scene/scene_utils.h
create mode 100644 contrib/draco/src/draco/scene/scene_utils_test.cc
create mode 100644 contrib/draco/src/draco/scene/trs_matrix.cc
create mode 100644 contrib/draco/src/draco/scene/trs_matrix.h
create mode 100644 contrib/draco/src/draco/scene/trs_matrix_test.cc
create mode 100644 contrib/draco/src/draco/texture/source_image.cc
create mode 100644 contrib/draco/src/draco/texture/source_image.h
create mode 100644 contrib/draco/src/draco/texture/texture.h
create mode 100644 contrib/draco/src/draco/texture/texture_library.cc
create mode 100644 contrib/draco/src/draco/texture/texture_library.h
create mode 100644 contrib/draco/src/draco/texture/texture_library_test.cc
create mode 100644 contrib/draco/src/draco/texture/texture_map.cc
create mode 100644 contrib/draco/src/draco/texture/texture_map.h
create mode 100644 contrib/draco/src/draco/texture/texture_map_test.cc
create mode 100644 contrib/draco/src/draco/texture/texture_transform.cc
create mode 100644 contrib/draco/src/draco/texture/texture_transform.h
create mode 100644 contrib/draco/src/draco/texture/texture_transform_test.cc
create mode 100644 contrib/draco/src/draco/texture/texture_utils.cc
create mode 100644 contrib/draco/src/draco/texture/texture_utils.h
create mode 100644 contrib/draco/src/draco/texture/texture_utils_test.cc
create mode 100644 contrib/draco/src/draco/tools/draco_transcoder.cc
create mode 100644 contrib/draco/src/draco/tools/draco_transcoder_lib.cc
create mode 100644 contrib/draco/src/draco/tools/draco_transcoder_lib.h
create mode 100644 contrib/draco/src/draco/tools/draco_transcoder_lib_test.cc
create mode 100644 contrib/draco/src/draco/tools/install_test/CMakeLists.txt
create mode 100644 contrib/draco/src/draco/tools/install_test/main.cc
create mode 100644 contrib/draco/src/draco/tools/install_test/test.py
diff --git a/contrib/draco/.cmake-format.py b/contrib/draco/.cmake-format.py
index 64f2495b4..5b36f67aa 100644
--- a/contrib/draco/.cmake-format.py
+++ b/contrib/draco/.cmake-format.py
@@ -1,102 +1,137 @@
-# Generated with cmake-format 0.5.1
-# How wide to allow formatted cmake files
-line_width = 80
-
-# How many spaces to tab for indent
-tab_size = 2
-
-# If arglists are longer than this, break them always
-max_subargs_per_line = 10
-
-# If true, separate flow control names from their parentheses with a space
-separate_ctrl_name_with_space = False
-
-# If true, separate function names from parentheses with a space
-separate_fn_name_with_space = False
-
-# If a statement is wrapped to more than one line, than dangle the closing
-# parenthesis on its own line
-dangle_parens = False
-
-# What character to use for bulleted lists
-bullet_char = '*'
-
-# What character to use as punctuation after numerals in an enumerated list
-enum_char = '.'
-
-# What style line endings to use in the output.
-line_ending = u'unix'
-
-# Format command names consistently as 'lower' or 'upper' case
-command_case = u'lower'
-
-# Format keywords consistently as 'lower' or 'upper' case
-keyword_case = u'unchanged'
-
-# Specify structure for custom cmake functions
-additional_commands = {
- "foo": {
- "flags": [
- "BAR",
- "BAZ"
- ],
- "kwargs": {
- "HEADERS": "*",
- "DEPENDS": "*",
- "SOURCES": "*"
- }
+with section('parse'):
+ # Specify structure for custom cmake functions
+ additional_commands = {
+ 'draco_add_emscripten_executable': {
+ 'kwargs': {
+ 'NAME': '*',
+ 'SOURCES': '*',
+ 'OUTPUT_NAME': '*',
+ 'DEFINES': '*',
+ 'INCLUDES': '*',
+ 'COMPILE_FLAGS': '*',
+ 'LINK_FLAGS': '*',
+ 'OBJLIB_DEPS': '*',
+ 'LIB_DEPS': '*',
+ 'GLUE_PATH': '*',
+ 'PRE_LINK_JS_SOURCES': '*',
+ 'POST_LINK_JS_SOURCES': '*',
+ 'FEATURES': '*',
+ },
+ 'pargs': 0,
+ },
+ 'draco_add_executable': {
+ 'kwargs': {
+ 'NAME': '*',
+ 'SOURCES': '*',
+ 'OUTPUT_NAME': '*',
+ 'TEST': 0,
+ 'DEFINES': '*',
+ 'INCLUDES': '*',
+ 'COMPILE_FLAGS': '*',
+ 'LINK_FLAGS': '*',
+ 'OBJLIB_DEPS': '*',
+ 'LIB_DEPS': '*',
+ },
+ 'pargs': 0,
+ },
+ 'draco_add_library': {
+ 'kwargs': {
+ 'NAME': '*',
+ 'TYPE': '*',
+ 'SOURCES': '*',
+ 'TEST': 0,
+ 'OUTPUT_NAME': '*',
+ 'DEFINES': '*',
+ 'INCLUDES': '*',
+ 'COMPILE_FLAGS': '*',
+ 'LINK_FLAGS': '*',
+ 'OBJLIB_DEPS': '*',
+ 'LIB_DEPS': '*',
+ 'PUBLIC_INCLUDES': '*',
+ },
+ 'pargs': 0,
+ },
+ 'draco_generate_emscripten_glue': {
+ 'kwargs': {
+ 'INPUT_IDL': '*',
+ 'OUTPUT_PATH': '*',
+ },
+ 'pargs': 0,
+ },
+ 'draco_get_required_emscripten_flags': {
+ 'kwargs': {
+ 'FLAG_LIST_VAR_COMPILER': '*',
+ 'FLAG_LIST_VAR_LINKER': '*',
+ },
+ 'pargs': 0,
+ },
+ 'draco_option': {
+ 'kwargs': {
+ 'NAME': '*',
+ 'HELPSTRING': '*',
+ 'VALUE': '*',
+ },
+ 'pargs': 0,
+ },
+ # Rules for built in CMake commands and those from dependencies.
+ 'list': {
+ 'kwargs': {
+ 'APPEND': '*',
+ 'FILTER': '*',
+ 'FIND': '*',
+ 'GET': '*',
+ 'INSERT': '*',
+ 'JOIN': '*',
+ 'LENGTH': '*',
+ 'POP_BACK': '*',
+ 'POP_FRONT': '*',
+ 'PREPEND': '*',
+ 'REMOVE_DUPLICATES': '*',
+ 'REMOVE_ITEM': '*',
+ 'REVERSE': '*',
+ 'SORT': '*',
+ 'SUBLIST': '*',
+ 'TRANSFORM': '*',
+ },
+ },
+ 'protobuf_generate': {
+ 'kwargs': {
+ 'IMPORT_DIRS': '*',
+ 'LANGUAGE': '*',
+ 'OUT_VAR': '*',
+ 'PROTOC_OUT_DIR': '*',
+ 'PROTOS': '*',
+ },
+ },
}
-}
-# A list of command names which should always be wrapped
-always_wrap = []
+with section('format'):
+ # Formatting options.
-# Specify the order of wrapping algorithms during successive reflow attempts
-algorithm_order = [0, 1, 2, 3, 4]
+ # How wide to allow formatted cmake files
+ line_width = 80
-# If true, the argument lists which are known to be sortable will be sorted
-# lexicographicall
-autosort = False
+ # How many spaces to tab for indent
+ tab_size = 2
-# enable comment markup parsing and reflow
-enable_markup = True
+ # If true, separate flow control names from their parentheses with a space
+ separate_ctrl_name_with_space = False
-# If comment markup is enabled, don't reflow the first comment block in
-# eachlistfile. Use this to preserve formatting of your
-# copyright/licensestatements.
-first_comment_is_literal = False
+ # If true, separate function names from parentheses with a space
+ separate_fn_name_with_space = False
-# If comment markup is enabled, don't reflow any comment block which matchesthis
-# (regex) pattern. Default is `None` (disabled).
-literal_comment_pattern = None
+ # If a statement is wrapped to more than one line, than dangle the closing
+ # parenthesis on its own line.
+ dangle_parens = False
-# Regular expression to match preformat fences in comments
-# default=r'^\s*([`~]{3}[`~]*)(.*)$'
-fence_pattern = u'^\\s*([`~]{3}[`~]*)(.*)$'
+ # Do not sort argument lists.
+ enable_sort = False
-# Regular expression to match rulers in comments
-# default=r'^\s*[^\w\s]{3}.*[^\w\s]{3}$'
-ruler_pattern = u'^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$'
+ # What style line endings to use in the output.
+ line_ending = 'unix'
-# If true, emit the unicode byte-order mark (BOM) at the start of the file
-emit_byteorder_mark = False
+ # Format command names consistently as 'lower' or 'upper' case
+ command_case = 'canonical'
-# If a comment line starts with at least this many consecutive hash characters,
-# then don't lstrip() them off. This allows for lazy hash rulers where the first
-# hash char is not separated by space
-hashruler_min_length = 10
-
-# If true, then insert a space between the first hash char and remaining hash
-# chars in a hash ruler, and normalize its length to fill the column
-canonicalize_hashrulers = True
-
-# Specify the encoding of the input file. Defaults to utf-8.
-input_encoding = u'utf-8'
-
-# Specify the encoding of the output file. Defaults to utf-8. Note that cmake
-# only claims to support utf-8 so be careful when using anything else
-output_encoding = u'utf-8'
-
-# A dictionary containing any per-command configuration overrides. Currently
-# only `command_case` is supported.
-per_command = {}
+ # Format keywords consistently as 'lower' or 'upper' case
+ keyword_case = 'upper'
diff --git a/contrib/draco/.gitattributes b/contrib/draco/.gitattributes
new file mode 100644
index 000000000..96acfc612
--- /dev/null
+++ b/contrib/draco/.gitattributes
@@ -0,0 +1 @@
+*.obj eol=lf
\ No newline at end of file
diff --git a/contrib/draco/.gitmodules b/contrib/draco/.gitmodules
new file mode 100644
index 000000000..25f0a1c03
--- /dev/null
+++ b/contrib/draco/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "third_party/googletest"]
+ path = third_party/googletest
+ url = https://github.com/google/googletest.git
+[submodule "third_party/eigen"]
+ path = third_party/eigen
+ url = https://gitlab.com/libeigen/eigen.git
+[submodule "third_party/tinygltf"]
+ path = third_party/tinygltf
+ url = https://github.com/syoyo/tinygltf.git
+[submodule "third_party/filesystem"]
+ path = third_party/filesystem
+ url = https://github.com/gulrak/filesystem
diff --git a/contrib/draco/BUILDING.md b/contrib/draco/BUILDING.md
index d33917b88..340b2b83b 100644
--- a/contrib/draco/BUILDING.md
+++ b/contrib/draco/BUILDING.md
@@ -4,8 +4,10 @@ _**Contents**_
* [Mac OS X](#mac-os-x)
* [Windows](#windows)
* [CMake Build Configuration](#cmake-build-configuration)
+ * [Transcoder](#transcoder)
* [Debugging and Optimization](#debugging-and-optimization)
* [Googletest Integration](#googletest-integration)
+ * [Third Party Libraries](#third-party-libraries)
* [Javascript Encoder/Decoder](#javascript-encoderdecoder)
* [WebAssembly Decoder](#webassembly-decoder)
* [WebAssembly Mesh Only Decoder](#webassembly-mesh-only-decoder)
@@ -72,6 +74,43 @@ C:\Users\nobody> cmake ../ -G "Visual Studio 16 2019" -A x64
CMake Build Configuration
-------------------------
+Transcoder
+----------
+
+Before attempting to build Draco with transcoding support you must run an
+additional Git command to obtain the submodules:
+
+~~~~~ bash
+# Run this command from within your Draco clone.
+$ git submodule update --init
+# See below if you prefer to use existing versions of Draco dependencies.
+~~~~~
+
+In order to build the `draco_transcoder` target, the transcoding support needs
+to be explicitly enabled when you run `cmake`, for example:
+
+~~~~~ bash
+$ cmake ../ -DDRACO_TRANSCODER_SUPPORTED=ON
+~~~~~
+
+The above option is currently not compatible with our Javascript or WebAssembly
+builds but all other use cases are supported. Note that binaries and libraries
+built with the transcoder support may result in increased binary sizes of the
+produced libraries and executables compared to the default CMake settings.
+
+The following CMake variables can be used to configure Draco to use local
+copies of third party dependencies instead of git submodules.
+
+- `DRACO_EIGEN_PATH`: this path must contain an Eigen directory that includes
+ the Eigen sources.
+- `DRACO_FILESYSTEM_PATH`: this path must contain the ghc directory where the
+ filesystem includes are located.
+- `DRACO_TINYGLTF_PATH`: this path must contain tiny_gltf.h and its
+ dependencies.
+
+When not specified the Draco build requires the presence of the submodules that
+are stored within `draco/third_party`.
+
Debugging and Optimization
--------------------------
@@ -114,17 +153,52 @@ $ cmake ../ -DDRACO_SANITIZE=address
Googletest Integration
----------------------
-Draco includes testing support built using Googletest. To enable Googletest unit
-test support the DRACO_TESTS cmake variable must be turned on at cmake
-generation time:
+Draco includes testing support built using Googletest. The Googletest repository
+is included as a submodule of the Draco git repository. Run the following
+command to clone the Googletest repository:
+
+~~~~~ bash
+$ git submodule update --init
+~~~~~
+
+To enable Googletest unit test support the DRACO_TESTS cmake variable must be
+turned on at cmake generation time:
~~~~~ bash
$ cmake ../ -DDRACO_TESTS=ON
~~~~~
-When cmake is used as shown in the above example the googletest directory must
-be a sibling of the Draco repository root directory. To run the tests execute
-`draco_tests` from your build output directory.
+To run the tests execute `draco_tests` from your build output directory:
+
+~~~~~ bash
+$ ./draco_tests
+~~~~~
+
+Draco can be configured to use a local Googletest installation. The
+`DRACO_GOOGLETEST_PATH` variable overrides the behavior described above and
+configures Draco to use the Googletest at the specified path.
+
+Third Party Libraries
+---------------------
+
+When Draco is built with transcoding and/or testing support enabled the project
+has dependencies on third party libraries:
+
+- [Eigen](https://eigen.tuxfamily.org/)
+ - Provides various math utilites.
+- [Googletest](https://github.com/google/googletest)
+ - Provides testing support.
+- [Gulrak/filesystem](https://github.com/gulrak/filesystem)
+ - Provides C++17 std::filesystem emulation for pre-C++17 environments.
+- [TinyGLTF](https://github.com/syoyo/tinygltf)
+ - Provides GLTF I/O support.
+
+These dependencies are managed as Git submodules. To obtain the dependencies
+run the following command in your Draco repository:
+
+~~~~~ bash
+$ git submodule update --init
+~~~~~
WebAssembly Decoder
-------------------
diff --git a/contrib/draco/CMakeLists.txt b/contrib/draco/CMakeLists.txt
index 6ea9b21fd..a93267d25 100644
--- a/contrib/draco/CMakeLists.txt
+++ b/contrib/draco/CMakeLists.txt
@@ -1,7 +1,18 @@
-cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
-# Draco requires C++11.
-set(CMAKE_CXX_STANDARD 11)
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
project(draco C CXX)
if(NOT CMAKE_BUILD_TYPE)
@@ -10,21 +21,23 @@ endif()
set(draco_root "${CMAKE_CURRENT_SOURCE_DIR}")
set(draco_src_root "${draco_root}/src/draco")
-set(draco_build "${Assimp_BINARY_DIR}")
+set(draco_build "${CMAKE_BINARY_DIR}")
if("${draco_root}" STREQUAL "${draco_build}")
message(
- FATAL_ERROR "Building from within the Draco source tree is not supported.\n"
- "Hint: Run these commands\n"
- "$ rm -rf CMakeCache.txt CMakeFiles\n"
- "$ mkdir -p ../draco_build\n" "$ cd ../draco_build\n"
- "And re-run CMake from the draco_build directory.")
+ FATAL_ERROR
+ "Building from within the Draco source tree is not supported.\n"
+ "Hint: Run these commands\n"
+ "$ rm -rf CMakeCache.txt CMakeFiles\n"
+ "$ mkdir -p ../draco_build\n"
+ "$ cd ../draco_build\n"
+ "And re-run CMake from the draco_build directory.")
endif()
-include(CMakePackageConfigHelpers)
include(FindPythonInterp)
include("${draco_root}/cmake/draco_build_definitions.cmake")
include("${draco_root}/cmake/draco_cpu_detection.cmake")
+include("${draco_root}/cmake/draco_dependencies.cmake")
include("${draco_root}/cmake/draco_emscripten.cmake")
include("${draco_root}/cmake/draco_flags.cmake")
include("${draco_root}/cmake/draco_helpers.cmake")
@@ -49,6 +62,7 @@ draco_track_configuration_variable(DRACO_GENERATED_SOURCES_DIRECTORY)
# Controls use of std::mutex and absl::Mutex in ThreadPool.
draco_track_configuration_variable(DRACO_THREADPOOL_USE_STD_MUTEX)
+
if(DRACO_VERBOSE)
draco_dump_cmake_flag_variables()
draco_dump_tracked_configuration_variables()
@@ -68,29 +82,32 @@ draco_reset_target_lists()
draco_setup_options()
draco_set_build_definitions()
draco_set_cxx_flags()
+draco_set_exe_linker_flags()
draco_generate_features_h()
# Draco source file listing variables.
-list(APPEND draco_attributes_sources
- "${draco_src_root}/attributes/attribute_octahedron_transform.cc"
- "${draco_src_root}/attributes/attribute_octahedron_transform.h"
- "${draco_src_root}/attributes/attribute_quantization_transform.cc"
- "${draco_src_root}/attributes/attribute_quantization_transform.h"
- "${draco_src_root}/attributes/attribute_transform.cc"
- "${draco_src_root}/attributes/attribute_transform.h"
- "${draco_src_root}/attributes/attribute_transform_data.h"
- "${draco_src_root}/attributes/attribute_transform_type.h"
- "${draco_src_root}/attributes/geometry_attribute.cc"
- "${draco_src_root}/attributes/geometry_attribute.h"
- "${draco_src_root}/attributes/geometry_indices.h"
- "${draco_src_root}/attributes/point_attribute.cc"
- "${draco_src_root}/attributes/point_attribute.h")
+list(
+ APPEND draco_attributes_sources
+ "${draco_src_root}/attributes/attribute_octahedron_transform.cc"
+ "${draco_src_root}/attributes/attribute_octahedron_transform.h"
+ "${draco_src_root}/attributes/attribute_quantization_transform.cc"
+ "${draco_src_root}/attributes/attribute_quantization_transform.h"
+ "${draco_src_root}/attributes/attribute_transform.cc"
+ "${draco_src_root}/attributes/attribute_transform.h"
+ "${draco_src_root}/attributes/attribute_transform_data.h"
+ "${draco_src_root}/attributes/attribute_transform_type.h"
+ "${draco_src_root}/attributes/geometry_attribute.cc"
+ "${draco_src_root}/attributes/geometry_attribute.h"
+ "${draco_src_root}/attributes/geometry_indices.h"
+ "${draco_src_root}/attributes/point_attribute.cc"
+ "${draco_src_root}/attributes/point_attribute.h")
list(
APPEND
draco_compression_attributes_dec_sources
"${draco_src_root}/compression/attributes/attributes_decoder.cc"
"${draco_src_root}/compression/attributes/attributes_decoder.h"
+ "${draco_src_root}/compression/attributes/attributes_decoder_interface.h"
"${draco_src_root}/compression/attributes/kd_tree_attributes_decoder.cc"
"${draco_src_root}/compression/attributes/kd_tree_attributes_decoder.h"
"${draco_src_root}/compression/attributes/kd_tree_attributes_shared.h"
@@ -107,7 +124,7 @@ list(
"${draco_src_root}/compression/attributes/sequential_normal_attribute_decoder.h"
"${draco_src_root}/compression/attributes/sequential_quantization_attribute_decoder.cc"
"${draco_src_root}/compression/attributes/sequential_quantization_attribute_decoder.h"
- )
+)
list(
APPEND
@@ -128,7 +145,7 @@ list(
"${draco_src_root}/compression/attributes/sequential_normal_attribute_encoder.h"
"${draco_src_root}/compression/attributes/sequential_quantization_attribute_encoder.cc"
"${draco_src_root}/compression/attributes/sequential_quantization_attribute_encoder.h"
- )
+)
list(
@@ -160,7 +177,7 @@ list(
"${draco_src_root}/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_transform_base.h"
"${draco_src_root}/compression/attributes/prediction_schemes/prediction_scheme_wrap_decoding_transform.h"
"${draco_src_root}/compression/attributes/prediction_schemes/prediction_scheme_wrap_transform_base.h"
- )
+)
list(
APPEND
@@ -192,7 +209,7 @@ list(
"${draco_src_root}/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_transform_base.h"
"${draco_src_root}/compression/attributes/prediction_schemes/prediction_scheme_wrap_encoding_transform.h"
"${draco_src_root}/compression/attributes/prediction_schemes/prediction_scheme_wrap_transform_base.h"
- )
+)
list(
APPEND
@@ -217,27 +234,34 @@ list(
"${draco_src_root}/compression/bit_coders/symbol_bit_encoder.cc"
"${draco_src_root}/compression/bit_coders/symbol_bit_encoder.h")
-list(APPEND draco_enc_config_sources
- "${draco_src_root}/compression/config/compression_shared.h"
- "${draco_src_root}/compression/config/draco_options.h"
- "${draco_src_root}/compression/config/encoder_options.h"
- "${draco_src_root}/compression/config/encoding_features.h")
+list(
+ APPEND draco_enc_config_sources
+ "${draco_src_root}/compression/config/compression_shared.h"
+ "${draco_src_root}/compression/config/draco_options.h"
+ "${draco_src_root}/compression/config/encoder_options.h"
+ "${draco_src_root}/compression/config/encoding_features.h")
-list(APPEND draco_dec_config_sources
- "${draco_src_root}/compression/config/compression_shared.h"
- "${draco_src_root}/compression/config/decoder_options.h"
- "${draco_src_root}/compression/config/draco_options.h")
+list(
+ APPEND draco_dec_config_sources
+ "${draco_src_root}/compression/config/compression_shared.h"
+ "${draco_src_root}/compression/config/decoder_options.h"
+ "${draco_src_root}/compression/config/draco_options.h")
+
+list(APPEND draco_compression_options_sources
+ "${draco_src_root}/compression/draco_compression_options.cc"
+ "${draco_src_root}/compression/draco_compression_options.h")
list(APPEND draco_compression_decode_sources
"${draco_src_root}/compression/decode.cc"
"${draco_src_root}/compression/decode.h")
-list(APPEND draco_compression_encode_sources
- "${draco_src_root}/compression/encode.cc"
- "${draco_src_root}/compression/encode.h"
- "${draco_src_root}/compression/encode_base.h"
- "${draco_src_root}/compression/expert_encode.cc"
- "${draco_src_root}/compression/expert_encode.h")
+list(
+ APPEND draco_compression_encode_sources
+ "${draco_src_root}/compression/encode.cc"
+ "${draco_src_root}/compression/encode.h"
+ "${draco_src_root}/compression/encode_base.h"
+ "${draco_src_root}/compression/expert_encode.cc"
+ "${draco_src_root}/compression/expert_encode.h")
list(
APPEND
@@ -291,7 +315,7 @@ list(
"${draco_src_root}/compression/point_cloud/point_cloud_kd_tree_decoder.h"
"${draco_src_root}/compression/point_cloud/point_cloud_sequential_decoder.cc"
"${draco_src_root}/compression/point_cloud/point_cloud_sequential_decoder.h"
- )
+)
list(
APPEND
@@ -302,112 +326,126 @@ list(
"${draco_src_root}/compression/point_cloud/point_cloud_kd_tree_encoder.h"
"${draco_src_root}/compression/point_cloud/point_cloud_sequential_encoder.cc"
"${draco_src_root}/compression/point_cloud/point_cloud_sequential_encoder.h"
- )
+)
-list(APPEND draco_compression_entropy_sources
- "${draco_src_root}/compression/entropy/ans.h"
- "${draco_src_root}/compression/entropy/rans_symbol_coding.h"
- "${draco_src_root}/compression/entropy/rans_symbol_decoder.h"
- "${draco_src_root}/compression/entropy/rans_symbol_encoder.h"
- "${draco_src_root}/compression/entropy/shannon_entropy.cc"
- "${draco_src_root}/compression/entropy/shannon_entropy.h"
- "${draco_src_root}/compression/entropy/symbol_decoding.cc"
- "${draco_src_root}/compression/entropy/symbol_decoding.h"
- "${draco_src_root}/compression/entropy/symbol_encoding.cc"
- "${draco_src_root}/compression/entropy/symbol_encoding.h")
+list(
+ APPEND draco_compression_entropy_sources
+ "${draco_src_root}/compression/entropy/ans.h"
+ "${draco_src_root}/compression/entropy/rans_symbol_coding.h"
+ "${draco_src_root}/compression/entropy/rans_symbol_decoder.h"
+ "${draco_src_root}/compression/entropy/rans_symbol_encoder.h"
+ "${draco_src_root}/compression/entropy/shannon_entropy.cc"
+ "${draco_src_root}/compression/entropy/shannon_entropy.h"
+ "${draco_src_root}/compression/entropy/symbol_decoding.cc"
+ "${draco_src_root}/compression/entropy/symbol_decoding.h"
+ "${draco_src_root}/compression/entropy/symbol_encoding.cc"
+ "${draco_src_root}/compression/entropy/symbol_encoding.h")
-list(APPEND draco_core_sources
- "${draco_src_root}/core/bit_utils.cc"
- "${draco_src_root}/core/bit_utils.h"
- "${draco_src_root}/core/bounding_box.cc"
- "${draco_src_root}/core/bounding_box.h"
- "${draco_src_root}/core/cycle_timer.cc"
- "${draco_src_root}/core/cycle_timer.h"
- "${draco_src_root}/core/data_buffer.cc"
- "${draco_src_root}/core/data_buffer.h"
- "${draco_src_root}/core/decoder_buffer.cc"
- "${draco_src_root}/core/decoder_buffer.h"
- "${draco_src_root}/core/divide.cc"
- "${draco_src_root}/core/divide.h"
- "${draco_src_root}/core/draco_index_type.h"
- "${draco_src_root}/core/draco_index_type_vector.h"
- "${draco_src_root}/core/draco_types.cc"
- "${draco_src_root}/core/draco_types.h"
- "${draco_src_root}/core/encoder_buffer.cc"
- "${draco_src_root}/core/encoder_buffer.h"
- "${draco_src_root}/core/hash_utils.cc"
- "${draco_src_root}/core/hash_utils.h"
- "${draco_src_root}/core/macros.h"
- "${draco_src_root}/core/math_utils.h"
- "${draco_src_root}/core/options.cc"
- "${draco_src_root}/core/options.h"
- "${draco_src_root}/core/quantization_utils.cc"
- "${draco_src_root}/core/quantization_utils.h"
- "${draco_src_root}/core/status.h"
- "${draco_src_root}/core/status_or.h"
- "${draco_src_root}/core/varint_decoding.h"
- "${draco_src_root}/core/varint_encoding.h"
- "${draco_src_root}/core/vector_d.h")
+list(
+ APPEND draco_core_sources
+ "${draco_src_root}/core/bit_utils.cc"
+ "${draco_src_root}/core/bit_utils.h"
+ "${draco_src_root}/core/bounding_box.cc"
+ "${draco_src_root}/core/bounding_box.h"
+ "${draco_src_root}/core/constants.h"
+ "${draco_src_root}/core/cycle_timer.cc"
+ "${draco_src_root}/core/cycle_timer.h"
+ "${draco_src_root}/core/data_buffer.cc"
+ "${draco_src_root}/core/data_buffer.h"
+ "${draco_src_root}/core/decoder_buffer.cc"
+ "${draco_src_root}/core/decoder_buffer.h"
+ "${draco_src_root}/core/divide.cc"
+ "${draco_src_root}/core/divide.h"
+ "${draco_src_root}/core/draco_index_type.h"
+ "${draco_src_root}/core/draco_index_type_vector.h"
+ "${draco_src_root}/core/draco_types.cc"
+ "${draco_src_root}/core/draco_types.h"
+ "${draco_src_root}/core/draco_version.h"
+ "${draco_src_root}/core/encoder_buffer.cc"
+ "${draco_src_root}/core/encoder_buffer.h"
+ "${draco_src_root}/core/hash_utils.cc"
+ "${draco_src_root}/core/hash_utils.h"
+ "${draco_src_root}/core/macros.h"
+ "${draco_src_root}/core/math_utils.h"
+ "${draco_src_root}/core/options.cc"
+ "${draco_src_root}/core/options.h"
+ "${draco_src_root}/core/quantization_utils.cc"
+ "${draco_src_root}/core/quantization_utils.h"
+ "${draco_src_root}/core/status.h"
+ "${draco_src_root}/core/status_or.h"
+ "${draco_src_root}/core/varint_decoding.h"
+ "${draco_src_root}/core/varint_encoding.h"
+ "${draco_src_root}/core/vector_d.h")
-list(APPEND draco_io_sources
- "${draco_src_root}/io/file_reader_factory.cc"
- "${draco_src_root}/io/file_reader_factory.h"
- "${draco_src_root}/io/file_reader_interface.h"
- "${draco_src_root}/io/file_utils.cc"
- "${draco_src_root}/io/file_utils.h"
- "${draco_src_root}/io/file_writer_factory.cc"
- "${draco_src_root}/io/file_writer_factory.h"
- "${draco_src_root}/io/file_writer_interface.h"
- "${draco_src_root}/io/file_writer_utils.h"
- "${draco_src_root}/io/file_writer_utils.cc"
- "${draco_src_root}/io/mesh_io.cc"
- "${draco_src_root}/io/mesh_io.h"
- "${draco_src_root}/io/obj_decoder.cc"
- "${draco_src_root}/io/obj_decoder.h"
- "${draco_src_root}/io/obj_encoder.cc"
- "${draco_src_root}/io/obj_encoder.h"
- "${draco_src_root}/io/parser_utils.cc"
- "${draco_src_root}/io/parser_utils.h"
- "${draco_src_root}/io/ply_decoder.cc"
- "${draco_src_root}/io/ply_decoder.h"
- "${draco_src_root}/io/ply_encoder.cc"
- "${draco_src_root}/io/ply_encoder.h"
- "${draco_src_root}/io/ply_property_reader.h"
- "${draco_src_root}/io/ply_property_writer.h"
- "${draco_src_root}/io/ply_reader.cc"
- "${draco_src_root}/io/ply_reader.h"
- "${draco_src_root}/io/point_cloud_io.cc"
- "${draco_src_root}/io/point_cloud_io.h"
- "${draco_src_root}/io/stdio_file_reader.cc"
- "${draco_src_root}/io/stdio_file_reader.h"
- "${draco_src_root}/io/stdio_file_writer.cc"
- "${draco_src_root}/io/stdio_file_writer.h")
+list(
+ APPEND draco_io_sources
+ "${draco_src_root}/io/file_reader_factory.cc"
+ "${draco_src_root}/io/file_reader_factory.h"
+ "${draco_src_root}/io/file_reader_interface.h"
+ "${draco_src_root}/io/file_utils.cc"
+ "${draco_src_root}/io/file_utils.h"
+ "${draco_src_root}/io/file_writer_factory.cc"
+ "${draco_src_root}/io/file_writer_factory.h"
+ "${draco_src_root}/io/file_writer_interface.h"
+ "${draco_src_root}/io/file_writer_utils.h"
+ "${draco_src_root}/io/file_writer_utils.cc"
+ "${draco_src_root}/io/mesh_io.cc"
+ "${draco_src_root}/io/mesh_io.h"
+ "${draco_src_root}/io/obj_decoder.cc"
+ "${draco_src_root}/io/obj_decoder.h"
+ "${draco_src_root}/io/obj_encoder.cc"
+ "${draco_src_root}/io/obj_encoder.h"
+ "${draco_src_root}/io/parser_utils.cc"
+ "${draco_src_root}/io/parser_utils.h"
+ "${draco_src_root}/io/ply_decoder.cc"
+ "${draco_src_root}/io/ply_decoder.h"
+ "${draco_src_root}/io/ply_encoder.cc"
+ "${draco_src_root}/io/ply_encoder.h"
+ "${draco_src_root}/io/ply_property_reader.h"
+ "${draco_src_root}/io/ply_property_writer.h"
+ "${draco_src_root}/io/ply_reader.cc"
+ "${draco_src_root}/io/ply_reader.h"
+ "${draco_src_root}/io/stl_decoder.cc"
+ "${draco_src_root}/io/stl_decoder.h"
+ "${draco_src_root}/io/stl_encoder.cc"
+ "${draco_src_root}/io/stl_encoder.h"
+ "${draco_src_root}/io/point_cloud_io.cc"
+ "${draco_src_root}/io/point_cloud_io.h"
+ "${draco_src_root}/io/stdio_file_reader.cc"
+ "${draco_src_root}/io/stdio_file_reader.h"
+ "${draco_src_root}/io/stdio_file_writer.cc"
+ "${draco_src_root}/io/stdio_file_writer.h")
-list(APPEND draco_mesh_sources
- "${draco_src_root}/mesh/corner_table.cc"
- "${draco_src_root}/mesh/corner_table.h"
- "${draco_src_root}/mesh/corner_table_iterators.h"
- "${draco_src_root}/mesh/mesh.cc"
- "${draco_src_root}/mesh/mesh.h"
- "${draco_src_root}/mesh/mesh_are_equivalent.cc"
- "${draco_src_root}/mesh/mesh_are_equivalent.h"
- "${draco_src_root}/mesh/mesh_attribute_corner_table.cc"
- "${draco_src_root}/mesh/mesh_attribute_corner_table.h"
- "${draco_src_root}/mesh/mesh_cleanup.cc"
- "${draco_src_root}/mesh/mesh_cleanup.h"
- "${draco_src_root}/mesh/mesh_misc_functions.cc"
- "${draco_src_root}/mesh/mesh_misc_functions.h"
- "${draco_src_root}/mesh/mesh_stripifier.cc"
- "${draco_src_root}/mesh/mesh_stripifier.h"
- "${draco_src_root}/mesh/triangle_soup_mesh_builder.cc"
- "${draco_src_root}/mesh/triangle_soup_mesh_builder.h"
- "${draco_src_root}/mesh/valence_cache.h")
+list(
+ APPEND draco_mesh_sources
+ "${draco_src_root}/mesh/corner_table.cc"
+ "${draco_src_root}/mesh/corner_table.h"
+ "${draco_src_root}/mesh/corner_table_iterators.h"
+ "${draco_src_root}/mesh/mesh.cc"
+ "${draco_src_root}/mesh/mesh.h"
+ "${draco_src_root}/mesh/mesh_are_equivalent.cc"
+ "${draco_src_root}/mesh/mesh_are_equivalent.h"
+ "${draco_src_root}/mesh/mesh_attribute_corner_table.cc"
+ "${draco_src_root}/mesh/mesh_attribute_corner_table.h"
+ "${draco_src_root}/mesh/mesh_cleanup.cc"
+ "${draco_src_root}/mesh/mesh_cleanup.h"
+ "${draco_src_root}/mesh/mesh_features.cc"
+ "${draco_src_root}/mesh/mesh_features.h"
+ "${draco_src_root}/mesh/mesh_indices.h"
+ "${draco_src_root}/mesh/mesh_misc_functions.cc"
+ "${draco_src_root}/mesh/mesh_misc_functions.h"
+ "${draco_src_root}/mesh/mesh_stripifier.cc"
+ "${draco_src_root}/mesh/mesh_stripifier.h"
+ "${draco_src_root}/mesh/triangle_soup_mesh_builder.cc"
+ "${draco_src_root}/mesh/triangle_soup_mesh_builder.h"
+ "${draco_src_root}/mesh/valence_cache.h")
-list(APPEND draco_point_cloud_sources
- "${draco_src_root}/point_cloud/point_cloud.cc"
- "${draco_src_root}/point_cloud/point_cloud.h"
- "${draco_src_root}/point_cloud/point_cloud_builder.cc"
- "${draco_src_root}/point_cloud/point_cloud_builder.h")
+list(
+ APPEND draco_point_cloud_sources
+ "${draco_src_root}/point_cloud/point_cloud.cc"
+ "${draco_src_root}/point_cloud/point_cloud.h"
+ "${draco_src_root}/point_cloud/point_cloud_builder.cc"
+ "${draco_src_root}/point_cloud/point_cloud_builder.h")
list(
APPEND
@@ -424,7 +462,7 @@ list(
"${draco_src_root}/compression/point_cloud/algorithms/dynamic_integer_points_kd_tree_decoder.h"
"${draco_src_root}/compression/point_cloud/algorithms/float_points_tree_decoder.cc"
"${draco_src_root}/compression/point_cloud/algorithms/float_points_tree_decoder.h"
- )
+)
list(
APPEND
@@ -433,13 +471,18 @@ list(
"${draco_src_root}/compression/point_cloud/algorithms/dynamic_integer_points_kd_tree_encoder.h"
"${draco_src_root}/compression/point_cloud/algorithms/float_points_tree_encoder.cc"
"${draco_src_root}/compression/point_cloud/algorithms/float_points_tree_encoder.h"
- )
+)
-list(APPEND draco_metadata_sources
- "${draco_src_root}/metadata/geometry_metadata.cc"
- "${draco_src_root}/metadata/geometry_metadata.h"
- "${draco_src_root}/metadata/metadata.cc"
- "${draco_src_root}/metadata/metadata.h")
+list(
+ APPEND draco_metadata_sources
+ "${draco_src_root}/metadata/geometry_metadata.cc"
+ "${draco_src_root}/metadata/geometry_metadata.h"
+ "${draco_src_root}/metadata/metadata.cc"
+ "${draco_src_root}/metadata/metadata.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")
list(APPEND draco_metadata_enc_sources
"${draco_src_root}/metadata/metadata_encoder.cc"
@@ -465,7 +508,7 @@ list(
APPEND draco_js_dec_sources
"${draco_src_root}/javascript/emscripten/decoder_webidl_wrapper.cc"
"${draco_src_root}/javascript/emscripten/draco_decoder_glue_wrapper.cc"
- )
+)
list(
APPEND draco_js_enc_sources
@@ -477,14 +520,14 @@ list(
draco_animation_js_dec_sources
"${draco_src_root}/javascript/emscripten/animation_decoder_webidl_wrapper.cc"
"${draco_src_root}/javascript/emscripten/draco_animation_decoder_glue_wrapper.cc"
- )
+)
list(
APPEND
draco_animation_js_enc_sources
"${draco_src_root}/javascript/emscripten/animation_encoder_webidl_wrapper.cc"
"${draco_src_root}/javascript/emscripten/draco_animation_encoder_glue_wrapper.cc"
- )
+)
list(APPEND draco_unity_plug_sources
"${draco_src_root}/unity/draco_unity_plugin.cc"
@@ -494,49 +537,133 @@ list(APPEND draco_maya_plug_sources
"${draco_src_root}/maya/draco_maya_plugin.cc"
"${draco_src_root}/maya/draco_maya_plugin.h")
+if(DRACO_TRANSCODER_SUPPORTED)
+ list(
+ APPEND draco_animation_sources
+ "${draco_src_root}/animation/animation.cc"
+ "${draco_src_root}/animation/animation.h"
+ "${draco_src_root}/animation/node_animation_data.h"
+ "${draco_src_root}/animation/skin.cc"
+ "${draco_src_root}/animation/skin.h")
+
+ list(
+ APPEND draco_io_sources
+ "${draco_src_root}/io/gltf_decoder.cc"
+ "${draco_src_root}/io/gltf_decoder.h"
+ "${draco_src_root}/io/gltf_encoder.cc"
+ "${draco_src_root}/io/gltf_encoder.h"
+ "${draco_src_root}/io/gltf_utils.cc"
+ "${draco_src_root}/io/gltf_utils.h"
+ "${draco_src_root}/io/image_compression_options.h"
+ "${draco_src_root}/io/scene_io.cc"
+ "${draco_src_root}/io/scene_io.h"
+ "${draco_src_root}/io/texture_io.cc"
+ "${draco_src_root}/io/texture_io.h"
+ "${draco_src_root}/io/tiny_gltf_utils.cc"
+ "${draco_src_root}/io/tiny_gltf_utils.h")
+
+ list(
+ APPEND draco_material_sources
+ "${draco_src_root}/material/material.cc"
+ "${draco_src_root}/material/material.h"
+ "${draco_src_root}/material/material_library.cc"
+ "${draco_src_root}/material/material_library.h")
+
+ list(
+ APPEND draco_mesh_sources
+ "${draco_src_root}/mesh/mesh_connected_components.h"
+ "${draco_src_root}/mesh/mesh_splitter.cc"
+ "${draco_src_root}/mesh/mesh_splitter.h"
+ "${draco_src_root}/mesh/mesh_utils.cc"
+ "${draco_src_root}/mesh/mesh_utils.h")
+
+ list(
+ APPEND draco_scene_sources
+ "${draco_src_root}/scene/instance_array.cc"
+ "${draco_src_root}/scene/instance_array.h"
+ "${draco_src_root}/scene/light.cc"
+ "${draco_src_root}/scene/light.h"
+ "${draco_src_root}/scene/mesh_group.h"
+ "${draco_src_root}/scene/scene.cc"
+ "${draco_src_root}/scene/scene.h"
+ "${draco_src_root}/scene/scene_are_equivalent.cc"
+ "${draco_src_root}/scene/scene_are_equivalent.h"
+ "${draco_src_root}/scene/scene_indices.h"
+ "${draco_src_root}/scene/scene_node.h"
+ "${draco_src_root}/scene/scene_utils.cc"
+ "${draco_src_root}/scene/scene_utils.h"
+ "${draco_src_root}/scene/trs_matrix.cc"
+ "${draco_src_root}/scene/trs_matrix.h")
+
+ list(
+ APPEND draco_texture_sources
+ "${draco_src_root}/texture/source_image.cc"
+ "${draco_src_root}/texture/source_image.h"
+ "${draco_src_root}/texture/texture.h"
+ "${draco_src_root}/texture/texture_library.cc"
+ "${draco_src_root}/texture/texture_library.h"
+ "${draco_src_root}/texture/texture_map.cc"
+ "${draco_src_root}/texture/texture_map.h"
+ "${draco_src_root}/texture/texture_transform.cc"
+ "${draco_src_root}/texture/texture_transform.h"
+ "${draco_src_root}/texture/texture_utils.cc"
+ "${draco_src_root}/texture/texture_utils.h")
+
+
+endif()
+
#
# Draco targets.
#
if(EMSCRIPTEN AND DRACO_JS_GLUE)
# Draco decoder and encoder "executable" targets in various flavors for
- # Emsscripten.
- list(APPEND draco_decoder_src
- ${draco_attributes_sources}
- ${draco_compression_attributes_dec_sources}
- ${draco_compression_attributes_pred_schemes_dec_sources}
- ${draco_compression_bit_coders_sources}
- ${draco_compression_decode_sources}
- ${draco_compression_entropy_sources}
- ${draco_compression_mesh_traverser_sources}
- ${draco_compression_mesh_dec_sources}
- ${draco_compression_point_cloud_dec_sources}
- ${draco_core_sources}
- ${draco_dec_config_sources}
- ${draco_js_dec_sources}
- ${draco_mesh_sources}
- ${draco_metadata_dec_sources}
- ${draco_metadata_sources}
- ${draco_point_cloud_sources}
- ${draco_points_dec_sources})
+ # Emscripten.
- list(APPEND draco_encoder_src
- ${draco_attributes_sources}
- ${draco_compression_attributes_enc_sources}
- ${draco_compression_attributes_pred_schemes_enc_sources}
- ${draco_compression_bit_coders_sources}
- ${draco_compression_encode_sources}
- ${draco_compression_entropy_sources}
- ${draco_compression_mesh_traverser_sources}
- ${draco_compression_mesh_enc_sources}
- ${draco_compression_point_cloud_enc_sources}
- ${draco_core_sources}
- ${draco_enc_config_sources}
- ${draco_js_enc_sources}
- ${draco_mesh_sources}
- ${draco_metadata_enc_sources}
- ${draco_metadata_sources}
- ${draco_point_cloud_sources}
- ${draco_points_enc_sources})
+ if(DRACO_TRANSCODER_SUPPORTED)
+ message(FATAL_ERROR "The transcoder is not supported in Emscripten.")
+ endif()
+
+ list(
+ APPEND draco_decoder_src
+ ${draco_attributes_sources}
+ ${draco_compression_attributes_dec_sources}
+ ${draco_compression_attributes_pred_schemes_dec_sources}
+ ${draco_compression_bit_coders_sources}
+ ${draco_compression_decode_sources}
+ ${draco_compression_entropy_sources}
+ ${draco_compression_mesh_traverser_sources}
+ ${draco_compression_mesh_dec_sources}
+ ${draco_compression_options_sources}
+ ${draco_compression_point_cloud_dec_sources}
+ ${draco_core_sources}
+ ${draco_dec_config_sources}
+ ${draco_js_dec_sources}
+ ${draco_mesh_sources}
+ ${draco_metadata_dec_sources}
+ ${draco_metadata_sources}
+ ${draco_point_cloud_sources}
+ ${draco_points_dec_sources})
+
+ list(
+ APPEND draco_encoder_src
+ ${draco_attributes_sources}
+ ${draco_compression_attributes_enc_sources}
+ ${draco_compression_attributes_pred_schemes_enc_sources}
+ ${draco_compression_bit_coders_sources}
+ ${draco_compression_encode_sources}
+ ${draco_compression_entropy_sources}
+ ${draco_compression_mesh_traverser_sources}
+ ${draco_compression_mesh_enc_sources}
+ ${draco_compression_options_sources}
+ ${draco_compression_point_cloud_enc_sources}
+ ${draco_core_sources}
+ ${draco_enc_config_sources}
+ ${draco_js_enc_sources}
+ ${draco_mesh_sources}
+ ${draco_metadata_enc_sources}
+ ${draco_metadata_sources}
+ ${draco_point_cloud_sources}
+ ${draco_points_enc_sources})
list(APPEND draco_js_dec_idl
"${draco_src_root}/javascript/emscripten/draco_web_decoder.idl")
@@ -561,10 +688,10 @@ if(EMSCRIPTEN AND DRACO_JS_GLUE)
set(draco_decoder_glue_path "${draco_build}/glue_decoder")
set(draco_encoder_glue_path "${draco_build}/glue_encoder")
- draco_generate_emscripten_glue(INPUT_IDL ${draco_js_dec_idl} OUTPUT_PATH
- ${draco_decoder_glue_path})
- draco_generate_emscripten_glue(INPUT_IDL ${draco_js_enc_idl} OUTPUT_PATH
- ${draco_encoder_glue_path})
+ draco_generate_emscripten_glue(INPUT_IDL ${draco_js_dec_idl}
+ OUTPUT_PATH ${draco_decoder_glue_path})
+ draco_generate_emscripten_glue(INPUT_IDL ${draco_js_enc_idl}
+ OUTPUT_PATH ${draco_encoder_glue_path})
if(DRACO_DECODER_ATTRIBUTE_DEDUPLICATION)
list(APPEND draco_decoder_features
@@ -572,45 +699,28 @@ if(EMSCRIPTEN AND DRACO_JS_GLUE)
"DRACO_ATTRIBUTE_VALUES_DEDUPLICATION_SUPPORTED")
endif()
- draco_add_emscripten_executable(NAME
- draco_decoder
- SOURCES
- ${draco_decoder_src}
- DEFINES
- ${draco_defines}
- FEATURES
- ${draco_decoder_features}
- INCLUDES
- ${draco_include_paths}
- LINK_FLAGS
- "-sEXPORT_NAME=\"DracoDecoderModule\""
- GLUE_PATH
- ${draco_decoder_glue_path}
- PRE_LINK_JS_SOURCES
- ${draco_pre_link_js_sources}
- POST_LINK_JS_SOURCES
- ${draco_post_link_js_decoder_sources})
+ draco_add_emscripten_executable(
+ NAME draco_decoder
+ SOURCES ${draco_decoder_src}
+ DEFINES ${draco_defines}
+ FEATURES ${draco_decoder_features}
+ INCLUDES ${draco_include_paths}
+ LINK_FLAGS "-sEXPORT_NAME=\"DracoDecoderModule\""
+ GLUE_PATH ${draco_decoder_glue_path}
+ PRE_LINK_JS_SOURCES ${draco_pre_link_js_sources}
+ POST_LINK_JS_SOURCES ${draco_post_link_js_decoder_sources})
draco_add_emscripten_executable(
- NAME
- draco_encoder
- SOURCES
- ${draco_encoder_src}
- DEFINES
- ${draco_defines}
- FEATURES
- DRACO_ATTRIBUTE_INDICES_DEDUPLICATION_SUPPORTED
- DRACO_ATTRIBUTE_VALUES_DEDUPLICATION_SUPPORTED
- INCLUDES
- ${draco_include_paths}
- LINK_FLAGS
- "-sEXPORT_NAME=\"DracoEncoderModule\""
- GLUE_PATH
- ${draco_encoder_glue_path}
- PRE_LINK_JS_SOURCES
- ${draco_pre_link_js_sources}
- POST_LINK_JS_SOURCES
- ${draco_post_link_js_sources})
+ NAME draco_encoder
+ SOURCES ${draco_encoder_src}
+ DEFINES ${draco_defines}
+ FEATURES DRACO_ATTRIBUTE_INDICES_DEDUPLICATION_SUPPORTED
+ DRACO_ATTRIBUTE_VALUES_DEDUPLICATION_SUPPORTED
+ INCLUDES ${draco_include_paths}
+ LINK_FLAGS "-sEXPORT_NAME=\"DracoEncoderModule\""
+ GLUE_PATH ${draco_encoder_glue_path}
+ PRE_LINK_JS_SOURCES ${draco_pre_link_js_sources}
+ POST_LINK_JS_SOURCES ${draco_post_link_js_sources})
if(DRACO_ANIMATION_ENCODING)
set(draco_anim_decoder_glue_path "${draco_build}/glue_animation_decoder")
@@ -622,186 +732,270 @@ if(EMSCRIPTEN AND DRACO_JS_GLUE)
OUTPUT_PATH ${draco_anim_encoder_glue_path})
draco_add_emscripten_executable(
- NAME
- draco_animation_decoder
- SOURCES
- ${draco_animation_dec_sources}
- ${draco_animation_js_dec_sources}
- ${draco_animation_sources}
- ${draco_decoder_src}
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths}
- LINK_FLAGS
- "-sEXPORT_NAME=\"DracoAnimationDecoderModule\""
- GLUE_PATH
- ${draco_anim_decoder_glue_path}
- PRE_LINK_JS_SOURCES
- ${draco_pre_link_js_sources}
- POST_LINK_JS_SOURCES
- ${draco_post_link_js_decoder_sources})
+ NAME draco_animation_decoder
+ SOURCES ${draco_animation_dec_sources} ${draco_animation_js_dec_sources}
+ ${draco_animation_sources} ${draco_decoder_src}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths}
+ LINK_FLAGS "-sEXPORT_NAME=\"DracoAnimationDecoderModule\""
+ GLUE_PATH ${draco_anim_decoder_glue_path}
+ PRE_LINK_JS_SOURCES ${draco_pre_link_js_sources}
+ POST_LINK_JS_SOURCES ${draco_post_link_js_decoder_sources})
draco_add_emscripten_executable(
- NAME
- draco_animation_encoder
- SOURCES
- ${draco_animation_enc_sources}
- ${draco_animation_js_enc_sources}
- ${draco_animation_sources}
- ${draco_encoder_src}
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths}
- LINK_FLAGS
- "-sEXPORT_NAME=\"DracoAnimationEncoderModule\""
- GLUE_PATH
- ${draco_anim_encoder_glue_path}
- PRE_LINK_JS_SOURCES
- ${draco_pre_link_js_sources}
- POST_LINK_JS_SOURCES
- ${draco_post_link_js_sources})
+ NAME draco_animation_encoder
+ SOURCES ${draco_animation_enc_sources} ${draco_animation_js_enc_sources}
+ ${draco_animation_sources} ${draco_encoder_src}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths}
+ LINK_FLAGS "-sEXPORT_NAME=\"DracoAnimationEncoderModule\""
+ GLUE_PATH ${draco_anim_encoder_glue_path}
+ PRE_LINK_JS_SOURCES ${draco_pre_link_js_sources}
+ POST_LINK_JS_SOURCES ${draco_post_link_js_sources})
endif()
else()
# Standard Draco libs, encoder and decoder. Object collections that mirror the
# Draco directory structure.
- draco_add_library(NAME draco_attributes TYPE OBJECT SOURCES
- ${draco_attributes_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
- draco_add_library(NAME
- draco_compression_attributes_dec
- OBJECT
- ${draco_compression_attributes_dec_sources}
- TYPE
- OBJECT
- SOURCES
- ${draco_compression_attributes_dec_sources}
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths})
- draco_add_library(NAME draco_compression_attributes_enc TYPE OBJECT SOURCES
- ${draco_compression_attributes_enc_sources} DEFINES
- ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_compression_attributes_pred_schemes_dec TYPE
- OBJECT SOURCES
- ${draco_compression_attributes_pred_schemes_dec_sources})
- draco_add_library(NAME draco_compression_attributes_pred_schemes_enc TYPE
- OBJECT SOURCES
- ${draco_compression_attributes_pred_schemes_enc_sources}
- DEFINES ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_compression_bit_coders TYPE OBJECT SOURCES
- ${draco_compression_bit_coders_sources} DEFINES
- ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_enc_config TYPE OBJECT SOURCES
- ${draco_enc_config_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_dec_config TYPE OBJECT SOURCES
- ${draco_dec_config_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_compression_decode TYPE OBJECT SOURCES
- ${draco_compression_decode_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_compression_encode TYPE OBJECT SOURCES
- ${draco_compression_encode_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_compression_entropy TYPE OBJECT SOURCES
- ${draco_compression_entropy_sources} DEFINES
- ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_compression_mesh_traverser TYPE OBJECT SOURCES
- ${draco_compression_mesh_traverser_sources} DEFINES
- ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_compression_mesh_dec TYPE OBJECT SOURCES
- ${draco_compression_mesh_dec_sources} DEFINES
- ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_compression_mesh_enc TYPE OBJECT SOURCES
- ${draco_compression_mesh_enc_sources} DEFINES
- ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_compression_point_cloud_dec TYPE OBJECT SOURCES
- ${draco_compression_point_cloud_dec_sources} DEFINES
- ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_compression_point_cloud_enc TYPE OBJECT SOURCES
- ${draco_compression_point_cloud_enc_sources} DEFINES
- ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_core TYPE OBJECT SOURCES ${draco_core_sources}
- DEFINES ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_io TYPE OBJECT SOURCES ${draco_io_sources}
- DEFINES ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_mesh TYPE OBJECT SOURCES ${draco_mesh_sources}
- DEFINES ${draco_defines} INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_metadata_dec TYPE OBJECT SOURCES
- ${draco_metadata_dec_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_metadata_enc TYPE OBJECT SOURCES
- ${draco_metadata_enc_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_metadata TYPE OBJECT SOURCES
- ${draco_metadata_sources} DEFINES ${draco_defines} INCLUDES
- ${draco_include_paths})
- draco_add_library(NAME draco_animation_dec TYPE OBJECT SOURCES
- ${draco_animation_dec_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_animation_enc TYPE OBJECT SOURCES
- ${draco_animation_enc_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
- draco_add_library(NAME draco_animation TYPE OBJECT SOURCES
- ${draco_animation_sources} DEFINES ${draco_defines} INCLUDES
- ${draco_include_paths})
- draco_add_library(NAME draco_point_cloud TYPE OBJECT SOURCES
- ${draco_point_cloud_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
- draco_add_library(NAME
- draco_points_dec
- TYPE
- OBJECT
- SOURCES
- ${draco_points_common_sources}
- ${draco_points_dec_sources}
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths})
- draco_add_library(NAME
- draco_points_enc
- TYPE
- OBJECT
- SOURCES
- ${draco_points_common_sources}
- ${draco_points_enc_sources}
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths})
+ draco_add_library(
+ NAME draco_attributes
+ TYPE OBJECT
+ SOURCES ${draco_attributes_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_attributes_dec OBJECT
+ ${draco_compression_attributes_dec_sources}
+ TYPE OBJECT
+ SOURCES ${draco_compression_attributes_dec_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_attributes_enc
+ TYPE OBJECT
+ SOURCES ${draco_compression_attributes_enc_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_attributes_pred_schemes_dec
+ TYPE OBJECT
+ SOURCES ${draco_compression_attributes_pred_schemes_dec_sources})
+ draco_add_library(
+ NAME draco_compression_attributes_pred_schemes_enc
+ TYPE OBJECT
+ SOURCES ${draco_compression_attributes_pred_schemes_enc_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_bit_coders
+ TYPE OBJECT
+ SOURCES ${draco_compression_bit_coders_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_enc_config
+ TYPE OBJECT
+ SOURCES ${draco_enc_config_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_dec_config
+ TYPE OBJECT
+ SOURCES ${draco_dec_config_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_decode
+ TYPE OBJECT
+ SOURCES ${draco_compression_decode_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_encode
+ TYPE OBJECT
+ SOURCES ${draco_compression_encode_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_entropy
+ TYPE OBJECT
+ SOURCES ${draco_compression_entropy_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_mesh_traverser
+ TYPE OBJECT
+ SOURCES ${draco_compression_mesh_traverser_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_mesh_dec
+ TYPE OBJECT
+ SOURCES ${draco_compression_mesh_dec_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_mesh_enc
+ TYPE OBJECT
+ SOURCES ${draco_compression_mesh_enc_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_options
+ TYPE OBJECT
+ SOURCES ${draco_compression_options_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_point_cloud_dec
+ TYPE OBJECT
+ SOURCES ${draco_compression_point_cloud_dec_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_compression_point_cloud_enc
+ TYPE OBJECT
+ SOURCES ${draco_compression_point_cloud_enc_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_core
+ TYPE OBJECT
+ SOURCES ${draco_core_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_io
+ TYPE OBJECT
+ SOURCES ${draco_io_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_mesh
+ TYPE OBJECT
+ SOURCES ${draco_mesh_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_metadata_dec
+ TYPE OBJECT
+ SOURCES ${draco_metadata_dec_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_metadata_enc
+ TYPE OBJECT
+ SOURCES ${draco_metadata_enc_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_metadata
+ TYPE OBJECT
+ SOURCES ${draco_metadata_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_animation_dec
+ TYPE OBJECT
+ SOURCES ${draco_animation_dec_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_animation_enc
+ TYPE OBJECT
+ SOURCES ${draco_animation_enc_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_animation
+ TYPE OBJECT
+ SOURCES ${draco_animation_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_point_cloud
+ TYPE OBJECT
+ SOURCES ${draco_point_cloud_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_points_dec
+ TYPE OBJECT
+ SOURCES ${draco_points_common_sources} ${draco_points_dec_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_points_enc
+ TYPE OBJECT
+ SOURCES ${draco_points_common_sources} ${draco_points_enc_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
- set(draco_object_library_deps
- draco_attributes
- draco_compression_attributes_dec
- draco_compression_attributes_enc
- draco_compression_attributes_pred_schemes_dec
- draco_compression_attributes_pred_schemes_enc
- draco_compression_bit_coders
- draco_compression_decode
- draco_compression_encode
- draco_compression_entropy
- draco_compression_mesh_dec
- draco_compression_mesh_enc
- draco_compression_point_cloud_dec
- draco_compression_point_cloud_enc
- draco_core
- draco_dec_config
- draco_enc_config
- draco_io
- draco_mesh
- draco_metadata
- draco_metadata_dec
- draco_metadata_enc
- draco_animation
- draco_animation_dec
- draco_animation_enc
- draco_point_cloud
- draco_points_dec
- draco_points_enc)
+ if(DRACO_TRANSCODER_SUPPORTED)
+ if(MSVC)
+ # TODO(https://github.com/google/draco/issues/826)
+ set_source_files_properties("${draco_src_root}/io/gltf_decoder.cc"
+ PROPERTIES COMPILE_OPTIONS "/Od")
+ endif()
+
+ draco_add_library(
+ NAME draco_material
+ TYPE OBJECT
+ SOURCES ${draco_material_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+
+ draco_add_library(
+ NAME draco_scene
+ TYPE OBJECT
+ SOURCES ${draco_scene_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+
+ draco_add_library(
+ NAME draco_texture
+ TYPE OBJECT
+ SOURCES ${draco_texture_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
+
+ endif()
+
+ list(
+ APPEND draco_object_library_deps
+ draco_attributes
+ draco_compression_attributes_dec
+ draco_compression_attributes_enc
+ draco_compression_attributes_pred_schemes_dec
+ draco_compression_attributes_pred_schemes_enc
+ draco_compression_bit_coders
+ draco_compression_decode
+ draco_compression_encode
+ draco_compression_entropy
+ draco_compression_mesh_dec
+ draco_compression_mesh_enc
+ draco_compression_options
+ draco_compression_point_cloud_dec
+ draco_compression_point_cloud_enc
+ draco_core
+ draco_dec_config
+ draco_enc_config
+ draco_io
+ draco_mesh
+ draco_metadata
+ draco_metadata_dec
+ draco_metadata_enc
+ draco_animation
+ draco_animation_dec
+ draco_animation_enc
+ draco_point_cloud
+ draco_points_dec
+ draco_points_enc)
+
+ if(DRACO_TRANSCODER_SUPPORTED)
+ list(APPEND draco_object_library_deps draco_material draco_scene
+ draco_texture)
+
+ endif()
# Library targets that consume the object collections.
if(MSVC)
@@ -809,56 +1003,48 @@ else()
# that the exported symbols are part of the DLL target. The unfortunate side
# effect of this is that a single configuration cannot output both the
# static library and the DLL: This results in an either/or situation.
- # Windows users of the draco build can have a DLL and an import library,
- # or they can have a static library; they cannot have both from a single
+ # Windows users of the draco build can have a DLL and an import library, or
+ # they can have a static library; they cannot have both from a single
# configuration of the build.
if(BUILD_SHARED_LIBS)
set(draco_lib_type SHARED)
else()
set(draco_lib_type STATIC)
endif()
- draco_add_library(NAME
- draco
- OUTPUT_NAME
- draco
- TYPE
- ${draco_lib_type}
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths}
- OBJLIB_DEPS
- ${draco_object_library_deps})
+ draco_add_library(
+ NAME draco
+ OUTPUT_NAME draco
+ TYPE ${draco_lib_type}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths}
+ OBJLIB_DEPS ${draco_object_library_deps}
+ LIB_DEPS ${draco_lib_deps})
+ add_library(draco::draco ALIAS draco)
else()
- draco_add_library(NAME
- draco_static
- OUTPUT_NAME
- draco
- TYPE
- STATIC
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths}
- OBJLIB_DEPS
- ${draco_object_library_deps})
+ draco_add_library(
+ NAME draco_static
+ OUTPUT_NAME draco
+ TYPE STATIC
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths}
+ OBJLIB_DEPS ${draco_object_library_deps}
+ LIB_DEPS ${draco_lib_deps})
if(BUILD_SHARED_LIBS)
- draco_add_library(NAME
- draco_shared
- SOURCES
- "${draco_src_root}/core/draco_version.h"
- OUTPUT_NAME
- draco
- TYPE
- SHARED
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths}
- LIB_DEPS
- draco_static)
+ draco_add_library(
+ NAME draco_shared
+ SOURCES "${draco_src_root}/core/draco_version.h"
+ OUTPUT_NAME draco
+ TYPE SHARED
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths}
+ LIB_DEPS draco_static)
+ add_library(draco::draco ALIAS draco_shared)
+ set_target_properties(draco_shared PROPERTIES EXPORT_NAME draco)
+ else()
+ add_library(draco::draco ALIAS draco_static)
+ set_target_properties(draco_static PROPERTIES EXPORT_NAME draco)
endif()
endif()
@@ -869,22 +1055,20 @@ else()
set(unity_decoder_lib_type MODULE)
endif()
- draco_add_library(NAME draco_unity_plugin TYPE OBJECT SOURCES
- ${draco_unity_plug_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_unity_plugin
+ TYPE OBJECT
+ SOURCES ${draco_unity_plug_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
- draco_add_library(NAME
- dracodec_unity
- TYPE
- ${unity_decoder_lib_type}
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths}
- OBJLIB_DEPS
- draco_unity_plugin
- LIB_DEPS
- ${draco_plugin_dependency})
+ draco_add_library(
+ NAME dracodec_unity
+ TYPE ${unity_decoder_lib_type}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths}
+ OBJLIB_DEPS draco_unity_plugin
+ LIB_DEPS ${draco_plugin_dependency})
# For Mac, we need to build a .bundle for the unity plugin.
if(APPLE)
@@ -893,22 +1077,20 @@ else()
endif()
if(DRACO_MAYA_PLUGIN)
- draco_add_library(NAME draco_maya_plugin TYPE OBJECT SOURCES
- ${draco_maya_plug_sources} DEFINES ${draco_defines}
- INCLUDES ${draco_include_paths})
+ draco_add_library(
+ NAME draco_maya_plugin
+ TYPE OBJECT
+ SOURCES ${draco_maya_plug_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths})
- draco_add_library(NAME
- draco_maya_wrapper
- TYPE
- MODULE
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths}
- OBJLIB_DEPS
- draco_maya_plugin
- LIB_DEPS
- ${draco_plugin_dependency})
+ draco_add_library(
+ NAME draco_maya_wrapper
+ TYPE MODULE
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths}
+ OBJLIB_DEPS draco_maya_plugin
+ LIB_DEPS ${draco_plugin_dependency})
# For Mac, we need to build a .bundle for the plugin.
if(APPLE)
@@ -917,29 +1099,44 @@ else()
endif()
# Draco app targets.
- draco_add_executable(NAME
- draco_decoder
- SOURCES
- "${draco_src_root}/tools/draco_decoder.cc"
- ${draco_io_sources}
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths}
- LIB_DEPS
- ${draco_dependency})
+ draco_add_executable(
+ NAME draco_decoder
+ SOURCES "${draco_src_root}/tools/draco_decoder.cc" ${draco_io_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths}
+ LIB_DEPS ${draco_dependency})
- draco_add_executable(NAME
- draco_encoder
- SOURCES
- "${draco_src_root}/tools/draco_encoder.cc"
- ${draco_io_sources}
- DEFINES
- ${draco_defines}
- INCLUDES
- ${draco_include_paths}
- LIB_DEPS
- ${draco_dependency})
+ draco_add_executable(
+ NAME draco_encoder
+ SOURCES "${draco_src_root}/tools/draco_encoder.cc" ${draco_io_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths}
+ LIB_DEPS ${draco_dependency})
+
+ if(DRACO_TRANSCODER_SUPPORTED)
+ draco_add_executable(
+ NAME draco_transcoder
+ SOURCES "${draco_src_root}/tools/draco_transcoder.cc"
+ "${draco_src_root}/tools/draco_transcoder_lib.cc"
+ "${draco_src_root}/tools/draco_transcoder_lib.h"
+ ${draco_io_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths}
+ LIB_DEPS ${draco_dependency})
+
+ if(DRACO_SIMPLIFIER_SUPPORTED)
+ draco_add_executable(
+ NAME draco_simplifier
+ SOURCES ${draco_pipeline_proto_header}
+ "${draco_src_root}/tools/draco_simplifier.cc"
+ "${draco_src_root}/tools/draco_simplifier_lib.cc"
+ "${draco_src_root}/tools/draco_simplifier_lib.h"
+ ${draco_io_sources}
+ DEFINES ${draco_defines}
+ INCLUDES ${draco_include_paths}
+ LIB_DEPS ${draco_dependency})
+ endif()
+ endif()
draco_setup_install_target()
draco_setup_test_targets()
diff --git a/contrib/draco/README.md b/contrib/draco/README.md
index 0d980b387..4cc717c8d 100644
--- a/contrib/draco/README.md
+++ b/contrib/draco/README.md
@@ -2,10 +2,93 @@
-[![Build Status](https://github.com/google/draco/workflows/Build/badge.svg)](https://github.com/google/draco/actions?query=workflow%3ABuild)
+[![draco-ci](https://github.com/google/draco/workflows/draco-ci/badge.svg?branch=master)](https://github.com/google/draco/actions/workflows/ci.yml)
News
=======
+
+Attention GStatic users: the Draco team strongly recommends using the versioned
+URLs for accessing Draco GStatic content. If you are using the URLs that include
+the `v1/decoders` substring within the URL, edge caching and GStatic propagation
+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.6 release:
+* Using the versioned www.gstatic.com WASM and Javascript decoders continues
+ to be recommended. To use v1.5.6, use this URL:
+ * https://www.gstatic.com/draco/versioned/decoders/1.5.6/*
+* The CMake flag DRACO_DEBUG_MSVC_WARNINGS has been replaced with
+ DRACO_DEBUG_COMPILER_WARNINGS, and the behavior has changed. It is now a
+ boolean flag defined in draco_options.cmake.
+* Bug fixes.
+* Security fixes.
+
+### Version 1.5.5 release:
+* Using the versioned www.gstatic.com WASM and Javascript decoders continues
+ to be recommended. To use v1.5.5, use this URL:
+ * https://www.gstatic.com/draco/versioned/decoders/1.5.5/*
+* Bug fix: https://github.com/google/draco/issues/935
+
+### Version 1.5.4 release:
+* Using the versioned www.gstatic.com WASM and Javascript decoders continues
+ to be recommended. To use v1.5.4, use this URL:
+ * https://www.gstatic.com/draco/versioned/decoders/1.5.4/*
+* Added partial support for glTF extensions EXT_mesh_features and
+ EXT_structural_metadata.
+* Bug fixes.
+* Security fixes.
+
+### Version 1.5.3 release:
+* Using the versioned www.gstatic.com WASM and Javascript decoders continues
+ to be recommended. To use v1.5.3, use this URL:
+ * https://www.gstatic.com/draco/versioned/decoders/1.5.3/*
+* Bug fixes.
+
+### Version 1.5.2 release
+* This is the same as v1.5.1 with the following two bug fixes:
+ * Fixes DRACO_TRANSCODER_SUPPORTED enabled builds.
+ * ABI version updated.
+
+### Version 1.5.1 release
+* Adds assertion enabled Emscripten builds to the release, and a subset of the
+ assertion enabled builds to GStatic. See the file listing below.
+* Custom paths to third party dependencies are now supported. See BUILDING.md
+ for more information.
+* The CMake configuration file draco-config.cmake is now tested and known to
+ work for using Draco in Linux, MacOS, and Windows CMake projects. See the
+ `install_test` subdirectory of `src/draco/tools` for more information.
+* Bug fixes.
+
+### Version 1.5.0 release
+* Adds the draco_transcoder tool. See the section below on the glTF transcoding
+ tool, and BUILDING.md for build and dependency information.
+* Some changes to configuration variables have been made for this release:
+ - The DRACO_GLTF flag has been renamed to DRACO_GLTF_BITSTREAM to help
+ increase understanding of its purpose, which is to limit Draco features to
+ those included in the Draco glTF specification.
+ - Variables exported in CMake via draco-config.cmake and find-draco.cmake
+ (formerly FindDraco.cmake) have been renamed. It's unlikely that this
+ impacts any existing projects as the aforementioned files were not formed
+ correctly. See [PR775](https://github.com/google/draco/pull/775) for full
+ details of the changes.
+* A CMake version file has been added.
+* The CMake install target now uses absolute paths direct from CMake instead
+ of building them using CMAKE_INSTALL_PREFIX. This was done to make Draco
+ easier to use for downstream packagers and should have little to no impact on
+ users picking up Draco from source.
+* Certain MSVC warnings have had their levels changed via compiler flag to
+ reduce the amount of noise output by the MSVC compilers. Set MSVC warning
+ level to 4, or define DRACO_DEBUG_MSVC_WARNINGS at CMake configuration time
+ to restore previous behavior.
+* Bug fixes.
+
+### Version 1.4.3 release
+* Using the versioned www.gstatic.com WASM and Javascript decoders continues
+ to be recommended. To use v1.4.3, use this URL:
+ * https://www.gstatic.com/draco/versioned/decoders/1.4.3/*
+* Bug fixes
+
### Version 1.4.1 release
* Using the versioned www.gstatic.com WASM and Javascript decoders is now
recommended. To use v1.4.1, use this URL:
@@ -129,6 +212,7 @@ _**Contents**_
* [Encoding Tool](#encoding-tool)
* [Encoding Point Clouds](#encoding-point-clouds)
* [Decoding Tool](#decoding-tool)
+ * [glTF Transcoding Tool](#gltf-transcoding-tool)
* [C++ Decoder API](#c-decoder-api)
* [Javascript Encoder API](#javascript-encoder-api)
* [Javascript Decoder API](#javascript-decoder-api)
@@ -136,6 +220,7 @@ _**Contents**_
* [Metadata API](#metadata-api)
* [NPM Package](#npm-package)
* [three.js Renderer Example](#threejs-renderer-example)
+ * [GStatic Javascript Builds](#gstatic-javascript-builds)
* [Support](#support)
* [License](#license)
* [References](#references)
@@ -170,16 +255,18 @@ Command Line Applications
------------------------
The default target created from the build files will be the `draco_encoder`
-and `draco_decoder` command line applications. For both applications, if you
-run them without any arguments or `-h`, the applications will output usage and
-options.
+and `draco_decoder` command line applications. Additionally, `draco_transcoder`
+is generated when CMake is run with the DRACO_TRANSCODER_SUPPORTED variable set
+to ON (see [BUILDING](BUILDING.md#transcoder) for more details). For all
+applications, if you run them without any arguments or `-h`, the applications
+will output usage and options.
Encoding Tool
-------------
-`draco_encoder` will read OBJ or PLY files as input, and output Draco-encoded
-files. We have included Stanford's [Bunny] mesh for testing. The basic command
-line looks like this:
+`draco_encoder` will read OBJ, STL or PLY files as input, and output
+Draco-encoded files. We have included Stanford's [Bunny] mesh for testing. The
+basic command line looks like this:
~~~~~ bash
./draco_encoder -i testdata/bun_zipper.ply -o out.drc
@@ -232,15 +319,34 @@ and denser point clouds.
Decoding Tool
-------------
-`draco_decoder` will read Draco files as input, and output OBJ or PLY files.
-The basic command line looks like this:
+`draco_decoder` will read Draco files as input, and output OBJ, STL or PLY
+files. The basic command line looks like this:
~~~~~ bash
./draco_decoder -i in.drc -o out.obj
~~~~~
+glTF Transcoding Tool
+---------------------
+
+`draco_transcoder` can be used to add Draco compression to glTF assets. The
+basic command line looks like this:
+
+~~~~~ bash
+./draco_transcoder -i in.glb -o out.glb
+~~~~~
+
+This command line will add geometry compression to all meshes in the `in.glb`
+file. Quantization values for different glTF attributes can be specified
+similarly to the `draco_encoder` tool. For example `-qp` can be used to define
+quantization of the position attribute:
+
+~~~~~ bash
+./draco_transcoder -i in.glb -o out.glb -qp 12
+~~~~~
+
C++ Decoder API
--------------
+---------------
If you'd like to add decoding to your applications you will need to include
the `draco_dec` library. In order to use the Draco decoder you need to
@@ -442,6 +548,30 @@ Javascript decoder using the `three.js` renderer.
Please see the [javascript/example/README.md](javascript/example/README.md) file for more information.
+GStatic Javascript Builds
+=========================
+
+Prebuilt versions of the Emscripten-built Draco javascript decoders are hosted
+on www.gstatic.com in version labeled directories:
+
+https://www.gstatic.com/draco/versioned/decoders/VERSION/*
+
+As of the v1.4.3 release the files available are:
+
+- [draco_decoder.js](https://www.gstatic.com/draco/versioned/decoders/1.4.3/draco_decoder.js)
+- [draco_decoder.wasm](https://www.gstatic.com/draco/versioned/decoders/1.4.3/draco_decoder.wasm)
+- [draco_decoder_gltf.js](https://www.gstatic.com/draco/versioned/decoders/1.4.3/draco_decoder_gltf.js)
+- [draco_decoder_gltf.wasm](https://www.gstatic.com/draco/versioned/decoders/1.4.3/draco_decoder_gltf.wasm)
+- [draco_wasm_wrapper.js](https://www.gstatic.com/draco/versioned/decoders/1.4.3/draco_wasm_wrapper.js)
+- [draco_wasm_wrapper_gltf.js](https://www.gstatic.com/draco/versioned/decoders/1.4.3/draco_wasm_wrapper_gltf.js)
+
+Beginning with the v1.5.1 release assertion enabled builds of the following
+files are available:
+
+- [draco_decoder.js](https://www.gstatic.com/draco/versioned/decoders/1.5.1/with_asserts/draco_decoder.js)
+- [draco_decoder.wasm](https://www.gstatic.com/draco/versioned/decoders/1.5.1/with_asserts/draco_decoder.wasm)
+- [draco_wasm_wrapper.js](https://www.gstatic.com/draco/versioned/decoders/1.5.1/with_asserts/draco_wasm_wrapper.js)
+
Support
=======
diff --git a/contrib/draco/cmake/DracoConfig.cmake b/contrib/draco/cmake/DracoConfig.cmake
deleted file mode 100644
index be5e1faef..000000000
--- a/contrib/draco/cmake/DracoConfig.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-@PACKAGE_INIT@
-set_and_check(draco_INCLUDE_DIR "@PACKAGE_draco_include_install_dir@")
-set_and_check(draco_LIBRARY_DIR "@PACKAGE_draco_lib_install_dir@")
diff --git a/contrib/draco/cmake/FindDraco.cmake b/contrib/draco/cmake/FindDraco.cmake
deleted file mode 100644
index 0a9193065..000000000
--- a/contrib/draco/cmake/FindDraco.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# Finddraco
-#
-# Locates draco and sets the following variables:
-#
-# draco_FOUND draco_INCLUDE_DIRS draco_LIBARY_DIRS draco_LIBRARIES
-# draco_VERSION_STRING
-#
-# draco_FOUND is set to YES only when all other variables are successfully
-# configured.
-
-unset(draco_FOUND)
-unset(draco_INCLUDE_DIRS)
-unset(draco_LIBRARY_DIRS)
-unset(draco_LIBRARIES)
-unset(draco_VERSION_STRING)
-
-mark_as_advanced(draco_FOUND)
-mark_as_advanced(draco_INCLUDE_DIRS)
-mark_as_advanced(draco_LIBRARY_DIRS)
-mark_as_advanced(draco_LIBRARIES)
-mark_as_advanced(draco_VERSION_STRING)
-
-set(draco_version_file_no_prefix "draco/src/draco/core/draco_version.h")
-
-# Set draco_INCLUDE_DIRS
-find_path(draco_INCLUDE_DIRS NAMES "${draco_version_file_no_prefix}")
-
-# Extract the version string from draco_version.h.
-if(draco_INCLUDE_DIRS)
- set(draco_version_file
- "${draco_INCLUDE_DIRS}/draco/src/draco/core/draco_version.h")
- file(STRINGS "${draco_version_file}" draco_version REGEX "kdracoVersion")
- list(GET draco_version 0 draco_version)
- string(REPLACE "static const char kdracoVersion[] = " "" draco_version
- "${draco_version}")
- string(REPLACE ";" "" draco_version "${draco_version}")
- string(REPLACE "\"" "" draco_version "${draco_version}")
- set(draco_VERSION_STRING ${draco_version})
-endif()
-
-# Find the library.
-if(BUILD_SHARED_LIBS)
- find_library(draco_LIBRARIES NAMES draco.dll libdraco.dylib libdraco.so)
-else()
- find_library(draco_LIBRARIES NAMES draco.lib libdraco.a)
-endif()
-
-# Store path to library.
-get_filename_component(draco_LIBRARY_DIRS ${draco_LIBRARIES} DIRECTORY)
-
-if(draco_INCLUDE_DIRS
- AND draco_LIBRARY_DIRS
- AND draco_LIBRARIES
- AND draco_VERSION_STRING)
- set(draco_FOUND YES)
-endif()
diff --git a/contrib/draco/cmake/compiler_flags.cmake b/contrib/draco/cmake/compiler_flags.cmake
deleted file mode 100644
index 8750e6f7d..000000000
--- a/contrib/draco/cmake/compiler_flags.cmake
+++ /dev/null
@@ -1,220 +0,0 @@
-if(DRACO_CMAKE_COMPILER_FLAGS_CMAKE_)
- return()
-endif()
-set(DRACO_CMAKE_COMPILER_FLAGS_CMAKE_ 1)
-
-include(CheckCCompilerFlag)
-include(CheckCXXCompilerFlag)
-include("${draco_root}/cmake/compiler_tests.cmake")
-
-# Strings used to cache failed C/CXX flags.
-set(DRACO_FAILED_C_FLAGS)
-set(DRACO_FAILED_CXX_FLAGS)
-
-# Checks C compiler for support of $c_flag. Adds $c_flag to $CMAKE_C_FLAGS when
-# the compile test passes. Caches $c_flag in $DRACO_FAILED_C_FLAGS when the test
-# fails.
-macro(add_c_flag_if_supported c_flag)
- unset(C_FLAG_FOUND CACHE)
- string(FIND "${CMAKE_C_FLAGS}" "${c_flag}" C_FLAG_FOUND)
- unset(C_FLAG_FAILED CACHE)
- string(FIND "${DRACO_FAILED_C_FLAGS}" "${c_flag}" C_FLAG_FAILED)
-
- if(${C_FLAG_FOUND} EQUAL -1 AND ${C_FLAG_FAILED} EQUAL -1)
- unset(C_FLAG_SUPPORTED CACHE)
- message("Checking C compiler flag support for: " ${c_flag})
- check_c_compiler_flag("${c_flag}" C_FLAG_SUPPORTED)
- if(${C_FLAG_SUPPORTED})
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${c_flag}" CACHE STRING "")
- else()
- set(DRACO_FAILED_C_FLAGS
- "${DRACO_FAILED_C_FLAGS} ${c_flag}"
- CACHE STRING "" FORCE)
- endif()
- endif()
-endmacro()
-
-# Checks C++ compiler for support of $cxx_flag. Adds $cxx_flag to
-# $CMAKE_CXX_FLAGS when the compile test passes. Caches $c_flag in
-# $DRACO_FAILED_CXX_FLAGS when the test fails.
-macro(add_cxx_flag_if_supported cxx_flag)
- unset(CXX_FLAG_FOUND CACHE)
- string(FIND "${CMAKE_CXX_FLAGS}" "${cxx_flag}" CXX_FLAG_FOUND)
- unset(CXX_FLAG_FAILED CACHE)
- string(FIND "${DRACO_FAILED_CXX_FLAGS}" "${cxx_flag}" CXX_FLAG_FAILED)
-
- if(${CXX_FLAG_FOUND} EQUAL -1 AND ${CXX_FLAG_FAILED} EQUAL -1)
- unset(CXX_FLAG_SUPPORTED CACHE)
- message("Checking CXX compiler flag support for: " ${cxx_flag})
- check_cxx_compiler_flag("${cxx_flag}" CXX_FLAG_SUPPORTED)
- if(${CXX_FLAG_SUPPORTED})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cxx_flag}" CACHE STRING "")
- else()
- set(DRACO_FAILED_CXX_FLAGS
- "${DRACO_FAILED_CXX_FLAGS} ${cxx_flag}"
- CACHE STRING "" FORCE)
- endif()
- endif()
-endmacro()
-
-# Convenience method for adding a flag to both the C and C++ compiler command
-# lines.
-macro(add_compiler_flag_if_supported flag)
- add_c_flag_if_supported(${flag})
- add_cxx_flag_if_supported(${flag})
-endmacro()
-
-# Checks C compiler for support of $c_flag and terminates generation when
-# support is not present.
-macro(require_c_flag c_flag update_c_flags)
- unset(C_FLAG_FOUND CACHE)
- string(FIND "${CMAKE_C_FLAGS}" "${c_flag}" C_FLAG_FOUND)
-
- if(${C_FLAG_FOUND} EQUAL -1)
- unset(HAVE_C_FLAG CACHE)
- message("Checking C compiler flag support for: " ${c_flag})
- check_c_compiler_flag("${c_flag}" HAVE_C_FLAG)
- if(NOT ${HAVE_C_FLAG})
- message(
- FATAL_ERROR "${PROJECT_NAME} requires support for C flag: ${c_flag}.")
- endif()
- if(${update_c_flags})
- set(CMAKE_C_FLAGS "${c_flag} ${CMAKE_C_FLAGS}" CACHE STRING "" FORCE)
- endif()
- endif()
-endmacro()
-
-# Checks CXX compiler for support of $cxx_flag and terminates generation when
-# support is not present.
-macro(require_cxx_flag cxx_flag update_cxx_flags)
- unset(CXX_FLAG_FOUND CACHE)
- string(FIND "${CMAKE_CXX_FLAGS}" "${cxx_flag}" CXX_FLAG_FOUND)
-
- if(${CXX_FLAG_FOUND} EQUAL -1)
- unset(HAVE_CXX_FLAG CACHE)
- message("Checking CXX compiler flag support for: " ${cxx_flag})
- check_cxx_compiler_flag("${cxx_flag}" HAVE_CXX_FLAG)
- if(NOT ${HAVE_CXX_FLAG})
- message(
- FATAL_ERROR
- "${PROJECT_NAME} requires support for CXX flag: ${cxx_flag}.")
- endif()
- if(${update_cxx_flags})
- set(CMAKE_CXX_FLAGS
- "${cxx_flag} ${CMAKE_CXX_FLAGS}"
- CACHE STRING "" FORCE)
- endif()
- endif()
-endmacro()
-
-# Checks for support of $flag by both the C and CXX compilers. Terminates
-# generation when support is not present in both compilers.
-macro(require_compiler_flag flag update_cmake_flags)
- require_c_flag(${flag} ${update_cmake_flags})
- require_cxx_flag(${flag} ${update_cmake_flags})
-endmacro()
-
-# Checks only non-MSVC targets for support of $c_flag and terminates generation
-# when support is not present.
-macro(require_c_flag_nomsvc c_flag update_c_flags)
- if(NOT MSVC)
- require_c_flag(${c_flag} ${update_c_flags})
- endif()
-endmacro()
-
-# Checks only non-MSVC targets for support of $cxx_flag and terminates
-# generation when support is not present.
-macro(require_cxx_flag_nomsvc cxx_flag update_cxx_flags)
- if(NOT MSVC)
- require_cxx_flag(${cxx_flag} ${update_cxx_flags})
- endif()
-endmacro()
-
-# Checks only non-MSVC targets for support of $flag by both the C and CXX
-# compilers. Terminates generation when support is not present in both
-# compilers.
-macro(require_compiler_flag_nomsvc flag update_cmake_flags)
- require_c_flag_nomsvc(${flag} ${update_cmake_flags})
- require_cxx_flag_nomsvc(${flag} ${update_cmake_flags})
-endmacro()
-
-# Adds $flag to assembler command line.
-macro(append_as_flag flag)
- unset(AS_FLAG_FOUND CACHE)
- string(FIND "${DRACO_AS_FLAGS}" "${flag}" AS_FLAG_FOUND)
-
- if(${AS_FLAG_FOUND} EQUAL -1)
- set(DRACO_AS_FLAGS "${DRACO_AS_FLAGS} ${flag}")
- endif()
-endmacro()
-
-# Adds $flag to the C compiler command line.
-macro(append_c_flag flag)
- unset(C_FLAG_FOUND CACHE)
- string(FIND "${CMAKE_C_FLAGS}" "${flag}" C_FLAG_FOUND)
-
- if(${C_FLAG_FOUND} EQUAL -1)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}")
- endif()
-endmacro()
-
-# Adds $flag to the CXX compiler command line.
-macro(append_cxx_flag flag)
- unset(CXX_FLAG_FOUND CACHE)
- string(FIND "${CMAKE_CXX_FLAGS}" "${flag}" CXX_FLAG_FOUND)
-
- if(${CXX_FLAG_FOUND} EQUAL -1)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
- endif()
-endmacro()
-
-# Adds $flag to the C and CXX compiler command lines.
-macro(append_compiler_flag flag)
- append_c_flag(${flag})
- append_cxx_flag(${flag})
-endmacro()
-
-# Adds $flag to the executable linker command line.
-macro(append_exe_linker_flag flag)
- unset(LINKER_FLAG_FOUND CACHE)
- string(FIND "${CMAKE_EXE_LINKER_FLAGS}" "${flag}" LINKER_FLAG_FOUND)
-
- if(${LINKER_FLAG_FOUND} EQUAL -1)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flag}")
- endif()
-endmacro()
-
-# Adds $flag to the link flags for $target.
-function(append_link_flag_to_target target flags)
- unset(target_link_flags)
- get_target_property(target_link_flags ${target} LINK_FLAGS)
-
- if(target_link_flags)
- unset(link_flag_found)
- string(FIND "${target_link_flags}" "${flags}" link_flag_found)
-
- if(NOT ${link_flag_found} EQUAL -1)
- return()
- endif()
-
- set(target_link_flags "${target_link_flags} ${flags}")
- else()
- set(target_link_flags "${flags}")
- endif()
-
- set_target_properties(${target} PROPERTIES LINK_FLAGS ${target_link_flags})
-endfunction()
-
-# Adds $flag to executable linker flags, and makes sure C/CXX builds still work.
-macro(require_linker_flag flag)
- append_exe_linker_flag(${flag})
-
- unset(c_passed)
- draco_check_c_compiles("LINKER_FLAG_C_TEST(${flag})" "" c_passed)
- unset(cxx_passed)
- draco_check_cxx_compiles("LINKER_FLAG_CXX_TEST(${flag})" "" cxx_passed)
-
- if(NOT c_passed OR NOT cxx_passed)
- message(FATAL_ERROR "Linker flag test for ${flag} failed.")
- endif()
-endmacro()
diff --git a/contrib/draco/cmake/compiler_tests.cmake b/contrib/draco/cmake/compiler_tests.cmake
deleted file mode 100644
index e781a6537..000000000
--- a/contrib/draco/cmake/compiler_tests.cmake
+++ /dev/null
@@ -1,103 +0,0 @@
-if(DRACO_CMAKE_COMPILER_TESTS_CMAKE_)
- return()
-endif()
-set(DRACO_CMAKE_COMPILER_TESTS_CMAKE_ 1)
-
-include(CheckCSourceCompiles)
-include(CheckCXXSourceCompiles)
-
-# The basic main() macro used in all compile tests.
-set(DRACO_C_MAIN "\nint main(void) { return 0; }")
-set(DRACO_CXX_MAIN "\nint main() { return 0; }")
-
-# Strings containing the names of passed and failed tests.
-set(DRACO_C_PASSED_TESTS)
-set(DRACO_C_FAILED_TESTS)
-set(DRACO_CXX_PASSED_TESTS)
-set(DRACO_CXX_FAILED_TESTS)
-
-macro(draco_push_var var new_value)
- set(SAVED_${var} ${var})
- set(${var} ${new_value})
-endmacro()
-
-macro(draco_pop_var var)
- set(var ${SAVED_${var}})
- unset(SAVED_${var})
-endmacro()
-
-# Confirms $test_source compiles and stores $test_name in one of
-# $DRACO_C_PASSED_TESTS or $DRACO_C_FAILED_TESTS depending on out come. When the
-# test passes $result_var is set to 1. When it fails $result_var is unset. The
-# test is not run if the test name is found in either of the passed or failed
-# test variables.
-macro(draco_check_c_compiles test_name test_source result_var)
- unset(C_TEST_PASSED CACHE)
- unset(C_TEST_FAILED CACHE)
- string(FIND "${DRACO_C_PASSED_TESTS}" "${test_name}" C_TEST_PASSED)
- string(FIND "${DRACO_C_FAILED_TESTS}" "${test_name}" C_TEST_FAILED)
- if(${C_TEST_PASSED} EQUAL -1 AND ${C_TEST_FAILED} EQUAL -1)
- unset(C_TEST_COMPILED CACHE)
- message("Running C compiler test: ${test_name}")
- check_c_source_compiles("${test_source} ${DRACO_C_MAIN}" C_TEST_COMPILED)
- set(${result_var} ${C_TEST_COMPILED})
-
- if(${C_TEST_COMPILED})
- set(DRACO_C_PASSED_TESTS "${DRACO_C_PASSED_TESTS} ${test_name}")
- else()
- set(DRACO_C_FAILED_TESTS "${DRACO_C_FAILED_TESTS} ${test_name}")
- message("C Compiler test ${test_name} failed.")
- endif()
- elseif(NOT ${C_TEST_PASSED} EQUAL -1)
- set(${result_var} 1)
- else() # ${C_TEST_FAILED} NOT EQUAL -1
- unset(${result_var})
- endif()
-endmacro()
-
-# Confirms $test_source compiles and stores $test_name in one of
-# $DRACO_CXX_PASSED_TESTS or $DRACO_CXX_FAILED_TESTS depending on out come. When
-# the test passes $result_var is set to 1. When it fails $result_var is unset.
-# The test is not run if the test name is found in either of the passed or
-# failed test variables.
-macro(draco_check_cxx_compiles test_name test_source result_var)
- unset(CXX_TEST_PASSED CACHE)
- unset(CXX_TEST_FAILED CACHE)
- string(FIND "${DRACO_CXX_PASSED_TESTS}" "${test_name}" CXX_TEST_PASSED)
- string(FIND "${DRACO_CXX_FAILED_TESTS}" "${test_name}" CXX_TEST_FAILED)
- if(${CXX_TEST_PASSED} EQUAL -1 AND ${CXX_TEST_FAILED} EQUAL -1)
- unset(CXX_TEST_COMPILED CACHE)
- message("Running CXX compiler test: ${test_name}")
- check_cxx_source_compiles("${test_source} ${DRACO_CXX_MAIN}"
- CXX_TEST_COMPILED)
- set(${result_var} ${CXX_TEST_COMPILED})
-
- if(${CXX_TEST_COMPILED})
- set(DRACO_CXX_PASSED_TESTS "${DRACO_CXX_PASSED_TESTS} ${test_name}")
- else()
- set(DRACO_CXX_FAILED_TESTS "${DRACO_CXX_FAILED_TESTS} ${test_name}")
- message("CXX Compiler test ${test_name} failed.")
- endif()
- elseif(NOT ${CXX_TEST_PASSED} EQUAL -1)
- set(${result_var} 1)
- else() # ${CXX_TEST_FAILED} NOT EQUAL -1
- unset(${result_var})
- endif()
-endmacro()
-
-# Convenience macro that confirms $test_source compiles as C and C++.
-# $result_var is set to 1 when both tests are successful, and 0 when one or both
-# tests fail. Note: This macro is intended to be used to write to result
-# variables that are expanded via configure_file(). $result_var is set to 1 or 0
-# to allow direct usage of the value in generated source files.
-macro(draco_check_source_compiles test_name test_source result_var)
- unset(C_PASSED)
- unset(CXX_PASSED)
- draco_check_c_compiles(${test_name} ${test_source} C_PASSED)
- draco_check_cxx_compiles(${test_name} ${test_source} CXX_PASSED)
- if(${C_PASSED} AND ${CXX_PASSED})
- set(${result_var} 1)
- else()
- set(${result_var} 0)
- endif()
-endmacro()
diff --git a/contrib/draco/cmake/draco-config.cmake.template b/contrib/draco/cmake/draco-config.cmake.template
index ca4a456bf..ed86823ea 100644
--- a/contrib/draco/cmake/draco-config.cmake.template
+++ b/contrib/draco/cmake/draco-config.cmake.template
@@ -1,2 +1,3 @@
-set(DRACO_INCLUDE_DIRS "@DRACO_INCLUDE_DIRS@")
-set(DRACO_LIBRARIES "draco")
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/draco-targets.cmake")
diff --git a/contrib/draco/cmake/draco.pc.template b/contrib/draco/cmake/draco.pc.template
index b8ae48212..050219ccb 100644
--- a/contrib/draco/cmake/draco.pc.template
+++ b/contrib/draco/cmake/draco.pc.template
@@ -1,11 +1,6 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
Name: @PROJECT_NAME@
Description: Draco geometry de(com)pression library.
Version: @DRACO_VERSION@
-Cflags: -I${includedir}
-Libs: -L${libdir} -ldraco
+Cflags: -I@includes_path@
+Libs: -L@libs_path@ -ldraco
Libs.private: @CMAKE_THREAD_LIBS_INIT@
diff --git a/contrib/draco/cmake/draco_build_definitions.cmake b/contrib/draco/cmake/draco_build_definitions.cmake
index f7354c15f..4dc232333 100644
--- a/contrib/draco/cmake/draco_build_definitions.cmake
+++ b/contrib/draco/cmake/draco_build_definitions.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_BUILD_DEFINITIONS_CMAKE_)
return()
endif() # DRACO_CMAKE_DRACO_BUILD_DEFINITIONS_CMAKE_
@@ -17,10 +31,6 @@ macro(set_draco_target)
endif()
set(draco_plugin_dependency draco_static)
endif()
-
- if(BUILD_SHARED_LIBS)
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
- endif()
endmacro()
# Configures flags and sets build system globals.
@@ -36,23 +46,37 @@ macro(draco_set_build_definitions)
endif()
draco_load_version_info()
- set(DRACO_SOVERSION 1)
+
+ # Library version info. See the libtool docs for updating the values:
+ # https://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
+ #
+ # c=, r=, a=
+ #
+ # libtool generates a .so file as .so.[c-a].a.r, while -version-info c:r:a is
+ # passed to libtool.
+ #
+ # We set DRACO_SOVERSION = [c-a].a.r
+ set(LT_CURRENT 8)
+ set(LT_REVISION 0)
+ set(LT_AGE 0)
+ math(EXPR DRACO_SOVERSION_MAJOR "${LT_CURRENT} - ${LT_AGE}")
+ set(DRACO_SOVERSION "${DRACO_SOVERSION_MAJOR}.${LT_AGE}.${LT_REVISION}")
+ unset(LT_CURRENT)
+ unset(LT_REVISION)
+ unset(LT_AGE)
list(APPEND draco_include_paths "${draco_root}" "${draco_root}/src"
"${draco_build}")
- if(DRACO_ABSL)
- list(APPEND draco_include_path "${draco_root}/third_party/abseil-cpp")
+ if(DRACO_TRANSCODER_SUPPORTED)
+ draco_setup_eigen()
+ draco_setup_filesystem()
+ draco_setup_tinygltf()
+
+
endif()
- list(APPEND draco_gtest_include_paths
- "${draco_root}/../googletest/googlemock/include"
- "${draco_root}/../googletest/googlemock"
- "${draco_root}/../googletest/googletest/include"
- "${draco_root}/../googletest/googletest")
- list(APPEND draco_test_include_paths ${draco_include_paths}
- ${draco_gtest_include_paths})
list(APPEND draco_defines "DRACO_CMAKE=1"
"DRACO_FLAGS_SRCDIR=\"${draco_root}\""
"DRACO_FLAGS_TMPDIR=\"/tmp\"")
@@ -63,11 +87,22 @@ macro(draco_set_build_definitions)
if(BUILD_SHARED_LIBS)
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
endif()
- else()
+ endif()
+
+ if(NOT MSVC)
if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
# Ensure 64-bit platforms can support large files.
list(APPEND draco_defines "_LARGEFILE_SOURCE" "_FILE_OFFSET_BITS=64")
endif()
+
+ if(NOT DRACO_DEBUG_COMPILER_WARNINGS)
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ list(APPEND draco_clang_cxx_flags
+ "-Wno-implicit-const-int-float-conversion")
+ else()
+ list(APPEND draco_base_cxx_flags "-Wno-deprecated-declarations")
+ endif()
+ endif()
endif()
if(ANDROID)
@@ -102,13 +137,9 @@ macro(draco_set_build_definitions)
set(draco_neon_source_file_suffix "neon.cc")
set(draco_sse4_source_file_suffix "sse4.cc")
- if((${CMAKE_CXX_COMPILER_ID}
- STREQUAL
- "GNU"
- AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 5)
- OR (${CMAKE_CXX_COMPILER_ID}
- STREQUAL
- "Clang"
+ if((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND ${CMAKE_CXX_COMPILER_VERSION}
+ VERSION_LESS 5)
+ OR (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang"
AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4))
message(
WARNING "GNU/GCC < v5 or Clang/LLVM < v4, ENABLING COMPATIBILITY MODE.")
@@ -117,7 +148,9 @@ macro(draco_set_build_definitions)
if(EMSCRIPTEN)
draco_check_emscripten_environment()
- draco_get_required_emscripten_flags(FLAG_LIST_VAR draco_base_cxx_flags)
+ draco_get_required_emscripten_flags(
+ FLAG_LIST_VAR_COMPILER draco_base_cxx_flags
+ FLAG_LIST_VAR_LINKER draco_base_exe_linker_flags)
endif()
draco_configure_sanitizer()
diff --git a/contrib/draco/cmake/draco_cpu_detection.cmake b/contrib/draco/cmake/draco_cpu_detection.cmake
index 96e4a289b..c3b77b80c 100644
--- a/contrib/draco/cmake/draco_cpu_detection.cmake
+++ b/contrib/draco/cmake/draco_cpu_detection.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_CPU_DETECTION_CMAKE_)
return()
endif() # DRACO_CMAKE_DRACO_CPU_DETECTION_CMAKE_
diff --git a/contrib/draco/cmake/draco_dependencies.cmake b/contrib/draco/cmake/draco_dependencies.cmake
new file mode 100644
index 000000000..91ee0839b
--- /dev/null
+++ b/contrib/draco/cmake/draco_dependencies.cmake
@@ -0,0 +1,136 @@
+# Copyright 2022 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+if(DRACO_CMAKE_DRACO_DEPENDENCIES_CMAKE)
+ return()
+endif()
+set(DRACO_CMAKE_DRACO_DEPENDENCIES_CMAKE 1)
+
+include("${draco_root}/cmake/draco_variables.cmake")
+
+# Each variable holds a user specified custom path to a local copy of the
+# sources that belong to each project that Draco depends on. When paths are
+# empty the build will be generated pointing to the Draco git submodules.
+# Otherwise the paths specified by the user will be used in the build
+# configuration.
+
+# Path to the Eigen. The path must contain the Eigen directory.
+set(DRACO_EIGEN_PATH)
+draco_track_configuration_variable(DRACO_EIGEN_PATH)
+
+# Path to the gulrak/filesystem installation. The path specified must contain
+# the ghc subdirectory that houses the filesystem includes.
+set(DRACO_FILESYSTEM_PATH)
+draco_track_configuration_variable(DRACO_FILESYSTEM_PATH)
+
+# Path to the googletest installation. The path must be to the root of the
+# Googletest project directory.
+set(DRACO_GOOGLETEST_PATH)
+draco_track_configuration_variable(DRACO_GOOGLETEST_PATH)
+
+# Path to the syoyo/tinygltf installation. The path must be to the root of the
+# project directory.
+set(DRACO_TINYGLTF_PATH)
+draco_track_configuration_variable(DRACO_TINYGLTF_PATH)
+
+# Utility macro for killing the build due to a missing submodule directory.
+macro(draco_die_missing_submodule dir)
+ message(FATAL_ERROR "${dir} missing, run git submodule update --init")
+endmacro()
+
+# Determines the Eigen location and updates the build configuration accordingly.
+macro(draco_setup_eigen)
+ if(DRACO_EIGEN_PATH)
+ set(eigen_path "${DRACO_EIGEN_PATH}")
+
+ if(NOT IS_DIRECTORY "${eigen_path}")
+ message(FATAL_ERROR "DRACO_EIGEN_PATH does not exist.")
+ endif()
+ else()
+ set(eigen_path "${draco_root}/third_party/eigen")
+
+ if(NOT IS_DIRECTORY "${eigen_path}")
+ draco_die_missing_submodule("${eigen_path}")
+ endif()
+ endif()
+
+ set(eigen_include_path "${eigen_path}/Eigen")
+
+ if(NOT EXISTS "${eigen_path}/Eigen")
+ message(FATAL_ERROR "The eigen path does not contain an Eigen directory.")
+ endif()
+
+ list(APPEND draco_include_paths "${eigen_path}")
+endmacro()
+
+# Determines the gulrak/filesystem location and updates the build configuration
+# accordingly.
+macro(draco_setup_filesystem)
+ if(DRACO_FILESYSTEM_PATH)
+ set(fs_path "${DRACO_FILESYSTEM_PATH}")
+
+ if(NOT IS_DIRECTORY "${fs_path}")
+ message(FATAL_ERROR "DRACO_FILESYSTEM_PATH does not exist.")
+ endif()
+ else()
+ set(fs_path "${draco_root}/third_party/filesystem/include")
+
+ if(NOT IS_DIRECTORY "${fs_path}")
+ draco_die_missing_submodule("${fs_path}")
+ endif()
+ endif()
+
+ list(APPEND draco_include_paths "${fs_path}")
+endmacro()
+
+# Determines the Googletest location and sets up include and source list vars
+# for the draco_tests build.
+macro(draco_setup_googletest)
+ if(DRACO_GOOGLETEST_PATH)
+ set(gtest_path "${DRACO_GOOGLETEST_PATH}")
+ if(NOT IS_DIRECTORY "${gtest_path}")
+ message(FATAL_ERROR "DRACO_GOOGLETEST_PATH does not exist.")
+ endif()
+ else()
+ set(gtest_path "${draco_root}/third_party/googletest")
+ endif()
+
+ list(APPEND draco_test_include_paths ${draco_include_paths}
+ "${gtest_path}/include" "${gtest_path}/googlemock"
+ "${gtest_path}/googletest/include" "${gtest_path}/googletest")
+
+ list(APPEND draco_gtest_all "${gtest_path}/googletest/src/gtest-all.cc")
+ list(APPEND draco_gtest_main "${gtest_path}/googletest/src/gtest_main.cc")
+endmacro()
+
+
+# Determines the location of TinyGLTF and updates the build configuration
+# accordingly.
+macro(draco_setup_tinygltf)
+ if(DRACO_TINYGLTF_PATH)
+ set(tinygltf_path "${DRACO_TINYGLTF_PATH}")
+
+ if(NOT IS_DIRECTORY "${tinygltf_path}")
+ message(FATAL_ERROR "DRACO_TINYGLTF_PATH does not exist.")
+ endif()
+ else()
+ set(tinygltf_path "${draco_root}/third_party/tinygltf")
+
+ if(NOT IS_DIRECTORY "${tinygltf_path}")
+ draco_die_missing_submodule("${tinygltf_path}")
+ endif()
+ endif()
+
+ list(APPEND draco_include_paths "${tinygltf_path}")
+endmacro()
diff --git a/contrib/draco/cmake/draco_emscripten.cmake b/contrib/draco/cmake/draco_emscripten.cmake
index 10c935043..c9616ae86 100644
--- a/contrib/draco/cmake/draco_emscripten.cmake
+++ b/contrib/draco/cmake/draco_emscripten.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_EMSCRIPTEN_CMAKE_)
return()
endif() # DRACO_CMAKE_DRACO_EMSCRIPTEN_CMAKE_
@@ -18,39 +32,64 @@ endmacro()
# Obtains the required Emscripten flags for Draco targets.
macro(draco_get_required_emscripten_flags)
- set(em_FLAG_LIST_VAR)
+ set(em_FLAG_LIST_VAR_COMPILER)
+ set(em_FLAG_LIST_VAR_LINKER)
set(em_flags)
- set(em_single_arg_opts FLAG_LIST_VAR)
+ set(em_single_arg_opts FLAG_LIST_VAR_COMPILER FLAG_LIST_VAR_LINKER)
set(em_multi_arg_opts)
cmake_parse_arguments(em "${em_flags}" "${em_single_arg_opts}"
"${em_multi_arg_opts}" ${ARGN})
- if(NOT em_FLAG_LIST_VAR)
- message(FATAL "draco_get_required_emscripten_flags: FLAG_LIST_VAR required")
+ if(NOT em_FLAG_LIST_VAR_COMPILER)
+ message(
+ FATAL
+ "draco_get_required_emscripten_flags: FLAG_LIST_VAR_COMPILER required")
+ endif()
+
+ if(NOT em_FLAG_LIST_VAR_LINKER)
+ message(
+ FATAL
+ "draco_get_required_emscripten_flags: FLAG_LIST_VAR_LINKER required")
endif()
if(DRACO_JS_GLUE)
unset(required_flags)
- list(APPEND ${em_FLAG_LIST_VAR} "-sALLOW_MEMORY_GROWTH=1")
- list(APPEND ${em_FLAG_LIST_VAR} "-Wno-almost-asm")
- list(APPEND ${em_FLAG_LIST_VAR} "--memory-init-file" "0")
- list(APPEND ${em_FLAG_LIST_VAR} "-fno-omit-frame-pointer")
- list(APPEND ${em_FLAG_LIST_VAR} "-sMODULARIZE=1")
- list(APPEND ${em_FLAG_LIST_VAR} "-sNO_FILESYSTEM=1")
- list(APPEND ${em_FLAG_LIST_VAR} "-sEXPORTED_RUNTIME_METHODS=[]")
- list(APPEND ${em_FLAG_LIST_VAR} "-sPRECISE_F32=1")
- list(APPEND ${em_FLAG_LIST_VAR} "-sNODEJS_CATCH_EXIT=0")
- list(APPEND ${em_FLAG_LIST_VAR} "-sNODEJS_CATCH_REJECTION=0")
+ # TODO(tomfinegan): Revisit splitting of compile/link flags for Emscripten,
+ # and drop -Wno-unused-command-line-argument. Emscripten complains about
+ # what are supposedly link-only flags sent with compile commands, but then
+ # proceeds to produce broken code if the warnings are heeded.
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER}
+ "-Wno-unused-command-line-argument")
+
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "-Wno-almost-asm")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "--memory-init-file" "0")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "-fno-omit-frame-pointer")
+
+ # According to Emscripten the following flags are linker only, but sending
+ # these flags (en masse) to only the linker results in a broken Emscripten
+ # build with an empty DracoDecoderModule.
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "-sALLOW_MEMORY_GROWTH=1")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "-sMODULARIZE=1")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "-sFILESYSTEM=0")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER}
+ "-sEXPORTED_FUNCTIONS=[\"_free\",\"_malloc\"]")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "-sPRECISE_F32=1")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "-sNODEJS_CATCH_EXIT=0")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "-sNODEJS_CATCH_REJECTION=0")
if(DRACO_FAST)
- list(APPEND ${em_FLAG_LIST_VAR} "--llvm-lto" "1")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "--llvm-lto" "1")
endif()
+
+ # The WASM flag is reported as linker only.
if(DRACO_WASM)
- list(APPEND ${em_FLAG_LIST_VAR} "-sWASM=1")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "-sWASM=1")
else()
- list(APPEND ${em_FLAG_LIST_VAR} "-sWASM=0")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "-sWASM=0")
endif()
+
+ # The LEGACY_VM_SUPPORT flag is reported as linker only.
if(DRACO_IE_COMPATIBLE)
- list(APPEND ${em_FLAG_LIST_VAR} "-sLEGACY_VM_SUPPORT=1")
+ list(APPEND ${em_FLAG_LIST_VAR_COMPILER} "-sLEGACY_VM_SUPPORT=1")
endif()
endif()
endmacro()
@@ -66,10 +105,11 @@ macro(draco_generate_emscripten_glue)
"${glue_multi_arg_opts}" ${ARGN})
if(DRACO_VERBOSE GREATER 1)
- message("--------- draco_generate_emscripten_glue -----------\n"
- "glue_INPUT_IDL=${glue_INPUT_IDL}\n"
- "glue_OUTPUT_PATH=${glue_OUTPUT_PATH}\n" ]
- "----------------------------------------------------\n")
+ message(
+ "--------- draco_generate_emscripten_glue -----------\n"
+ "glue_INPUT_IDL=${glue_INPUT_IDL}\n"
+ "glue_OUTPUT_PATH=${glue_OUTPUT_PATH}\n"
+ "----------------------------------------------------\n")
endif()
if(NOT glue_INPUT_IDL OR NOT glue_OUTPUT_PATH)
@@ -79,22 +119,22 @@ macro(draco_generate_emscripten_glue)
endif()
# Generate the glue source.
- execute_process(COMMAND ${PYTHON_EXECUTABLE}
- $ENV{EMSCRIPTEN}/tools/webidl_binder.py
- ${glue_INPUT_IDL} ${glue_OUTPUT_PATH})
+ execute_process(
+ COMMAND ${PYTHON_EXECUTABLE} $ENV{EMSCRIPTEN}/tools/webidl_binder.py
+ ${glue_INPUT_IDL} ${glue_OUTPUT_PATH})
if(NOT EXISTS "${glue_OUTPUT_PATH}.cpp")
message(FATAL_ERROR "JS glue generation failed for ${glue_INPUT_IDL}.")
endif()
# Create a dependency so that it regenerated on edits.
- add_custom_command(OUTPUT "${glue_OUTPUT_PATH}.cpp"
- COMMAND ${PYTHON_EXECUTABLE}
- $ENV{EMSCRIPTEN}/tools/webidl_binder.py
- ${glue_INPUT_IDL} ${glue_OUTPUT_PATH}
- DEPENDS ${draco_js_dec_idl}
- COMMENT "Generating ${glue_OUTPUT_PATH}.cpp."
- WORKING_DIRECTORY ${draco_build}
- VERBATIM)
+ add_custom_command(
+ OUTPUT "${glue_OUTPUT_PATH}.cpp"
+ COMMAND ${PYTHON_EXECUTABLE} $ENV{EMSCRIPTEN}/tools/webidl_binder.py
+ ${glue_INPUT_IDL} ${glue_OUTPUT_PATH}
+ DEPENDS ${draco_js_dec_idl}
+ COMMENT "Generating ${glue_OUTPUT_PATH}.cpp."
+ WORKING_DIRECTORY ${draco_build}
+ VERBATIM)
endmacro()
# Wrapper for draco_add_executable() that handles the extra work necessary for
@@ -120,8 +160,14 @@ macro(draco_add_emscripten_executable)
unset(emexe_LINK_FLAGS)
set(optional_args)
set(single_value_args NAME GLUE_PATH)
- set(multi_value_args SOURCES DEFINES FEATURES INCLUDES LINK_FLAGS
- PRE_LINK_JS_SOURCES POST_LINK_JS_SOURCES)
+ set(multi_value_args
+ SOURCES
+ DEFINES
+ FEATURES
+ INCLUDES
+ LINK_FLAGS
+ PRE_LINK_JS_SOURCES
+ POST_LINK_JS_SOURCES)
cmake_parse_arguments(emexe "${optional_args}" "${single_value_args}"
"${multi_value_args}" ${ARGN})
@@ -136,49 +182,50 @@ macro(draco_add_emscripten_executable)
endif()
if(DRACO_VERBOSE GREATER 1)
- message("--------- draco_add_emscripten_executable ---------\n"
- "emexe_NAME=${emexe_NAME}\n"
- "emexe_SOURCES=${emexe_SOURCES}\n"
- "emexe_DEFINES=${emexe_DEFINES}\n"
- "emexe_INCLUDES=${emexe_INCLUDES}\n"
- "emexe_LINK_FLAGS=${emexe_LINK_FLAGS}\n"
- "emexe_GLUE_PATH=${emexe_GLUE_PATH}\n"
- "emexe_FEATURES=${emexe_FEATURES}\n"
- "emexe_PRE_LINK_JS_SOURCES=${emexe_PRE_LINK_JS_SOURCES}\n"
- "emexe_POST_LINK_JS_SOURCES=${emexe_POST_LINK_JS_SOURCES}\n"
- "----------------------------------------------------\n")
+ message(
+ "--------- draco_add_emscripten_executable ---------\n"
+ "emexe_NAME=${emexe_NAME}\n"
+ "emexe_SOURCES=${emexe_SOURCES}\n"
+ "emexe_DEFINES=${emexe_DEFINES}\n"
+ "emexe_INCLUDES=${emexe_INCLUDES}\n"
+ "emexe_LINK_FLAGS=${emexe_LINK_FLAGS}\n"
+ "emexe_GLUE_PATH=${emexe_GLUE_PATH}\n"
+ "emexe_FEATURES=${emexe_FEATURES}\n"
+ "emexe_PRE_LINK_JS_SOURCES=${emexe_PRE_LINK_JS_SOURCES}\n"
+ "emexe_POST_LINK_JS_SOURCES=${emexe_POST_LINK_JS_SOURCES}\n"
+ "----------------------------------------------------\n")
endif()
# The Emscripten linker needs the C++ flags in addition to whatever has been
# passed in with the target.
list(APPEND emexe_LINK_FLAGS ${DRACO_CXX_FLAGS})
- if(DRACO_GLTF)
- draco_add_executable(NAME
- ${emexe_NAME}
- OUTPUT_NAME
- ${emexe_NAME}_gltf
- SOURCES
- ${emexe_SOURCES}
- DEFINES
- ${emexe_DEFINES}
- INCLUDES
- ${emexe_INCLUDES}
- LINK_FLAGS
- ${emexe_LINK_FLAGS})
+ if(DRACO_GLTF_BITSTREAM)
+ # Add "_gltf" suffix to target output name.
+ draco_add_executable(
+ NAME ${emexe_NAME}
+ OUTPUT_NAME ${emexe_NAME}_gltf
+ SOURCES ${emexe_SOURCES}
+ DEFINES ${emexe_DEFINES}
+ INCLUDES ${emexe_INCLUDES}
+ LINK_FLAGS ${emexe_LINK_FLAGS})
else()
- draco_add_executable(NAME ${emexe_NAME} SOURCES ${emexe_SOURCES} DEFINES
- ${emexe_DEFINES} INCLUDES ${emexe_INCLUDES} LINK_FLAGS
- ${emexe_LINK_FLAGS})
+ draco_add_executable(
+ NAME ${emexe_NAME}
+ SOURCES ${emexe_SOURCES}
+ DEFINES ${emexe_DEFINES}
+ INCLUDES ${emexe_INCLUDES}
+ LINK_FLAGS ${emexe_LINK_FLAGS})
endif()
foreach(feature ${emexe_FEATURES})
draco_enable_feature(FEATURE ${feature} TARGETS ${emexe_NAME})
endforeach()
- set_property(SOURCE ${emexe_SOURCES}
- APPEND
- PROPERTY OBJECT_DEPENDS "${emexe_GLUE_PATH}.cpp")
+ set_property(
+ SOURCE ${emexe_SOURCES}
+ APPEND
+ PROPERTY OBJECT_DEPENDS "${emexe_GLUE_PATH}.cpp")
em_link_pre_js(${emexe_NAME} ${emexe_PRE_LINK_JS_SOURCES})
em_link_post_js(${emexe_NAME} "${emexe_GLUE_PATH}.js"
${emexe_POST_LINK_JS_SOURCES})
diff --git a/contrib/draco/cmake/draco_flags.cmake b/contrib/draco/cmake/draco_flags.cmake
index 0397859a4..f3b24c6e1 100644
--- a/contrib/draco/cmake/draco_flags.cmake
+++ b/contrib/draco/cmake/draco_flags.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_FLAGS_CMAKE_)
return()
endif() # DRACO_CMAKE_DRACO_FLAGS_CMAKE_
@@ -24,7 +38,7 @@ macro(draco_set_compiler_flags_for_sources)
endif()
set_source_files_properties(${compiler_SOURCES} PROPERTIES COMPILE_FLAGS
- ${compiler_FLAGS})
+ ${compiler_FLAGS})
if(DRACO_VERBOSE GREATER 1)
foreach(source ${compiler_SOURCES})
@@ -85,8 +99,8 @@ macro(draco_test_cxx_flag)
# are passed as a list it will remove the list separators, and attempt to run
# a compile command using list entries concatenated together as a single
# argument. Avoid the problem by forcing the argument to be a string.
- draco_set_and_stringify(SOURCE_VARS all_cxx_flags DEST all_cxx_flags)
- check_cxx_compiler_flag("${all_cxx_flags}" draco_all_cxx_flags_pass)
+ draco_set_and_stringify(SOURCE_VARS all_cxx_flags DEST all_cxx_flags_string)
+ check_cxx_compiler_flag("${all_cxx_flags_string}" draco_all_cxx_flags_pass)
if(cxx_test_FLAG_REQUIRED AND NOT draco_all_cxx_flags_pass)
draco_die("Flag test failed for required flag(s): "
@@ -245,3 +259,34 @@ macro(draco_set_cxx_flags)
draco_test_cxx_flag(FLAG_LIST_VAR_NAMES ${cxx_flag_lists})
endif()
endmacro()
+
+# Collects Draco built-in and user-specified linker flags and tests them. Halts
+# configuration and reports the error when any flags cause the build to fail.
+#
+# Note: draco_test_exe_linker_flag() does the real work of setting the flags and
+# running the test compile commands.
+macro(draco_set_exe_linker_flags)
+ unset(linker_flag_lists)
+
+ if(DRACO_VERBOSE)
+ message("draco_set_exe_linker_flags: "
+ "draco_base_exe_linker_flags=${draco_base_exe_linker_flags}")
+ endif()
+
+ if(draco_base_exe_linker_flags)
+ list(APPEND linker_flag_lists draco_base_exe_linker_flags)
+ endif()
+
+ if(linker_flag_lists)
+ unset(test_linker_flags)
+
+ if(DRACO_VERBOSE)
+ message("draco_set_exe_linker_flags: "
+ "linker_flag_lists=${linker_flag_lists}")
+ endif()
+
+ draco_set_and_stringify(DEST test_linker_flags SOURCE_VARS
+ ${linker_flag_lists})
+ draco_test_exe_linker_flag(FLAG_LIST_VAR_NAME test_linker_flags)
+ endif()
+endmacro()
diff --git a/contrib/draco/cmake/draco_helpers.cmake b/contrib/draco/cmake/draco_helpers.cmake
index 0b3b804cf..69e24c5be 100644
--- a/contrib/draco/cmake/draco_helpers.cmake
+++ b/contrib/draco/cmake/draco_helpers.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_HELPERS_CMAKE_)
return()
endif() # DRACO_CMAKE_DRACO_HELPERS_CMAKE_
diff --git a/contrib/draco/cmake/draco_install.cmake b/contrib/draco/cmake/draco_install.cmake
index 09bfb591d..3be1ba163 100644
--- a/contrib/draco/cmake/draco_install.cmake
+++ b/contrib/draco/cmake/draco_install.cmake
@@ -1,32 +1,32 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_INSTALL_CMAKE_)
return()
endif() # DRACO_CMAKE_DRACO_INSTALL_CMAKE_
set(DRACO_CMAKE_DRACO_INSTALL_CMAKE_ 1)
+include(CMakePackageConfigHelpers)
+include(GNUInstallDirs)
+
# Sets up the draco install targets. Must be called after the static library
# target is created.
macro(draco_setup_install_target)
- include(GNUInstallDirs)
-
- # pkg-config: draco.pc
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
- set(libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
- set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
- set(draco_lib_name "draco")
-
- configure_file("${draco_root}/cmake/draco.pc.template"
- "${draco_build}/draco.pc" @ONLY NEWLINE_STYLE UNIX)
- install(FILES "${draco_build}/draco.pc"
- DESTINATION "${prefix}/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-
- # CMake config: draco-config.cmake
- set(DRACO_INCLUDE_DIRS "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
- configure_file("${draco_root}/cmake/draco-config.cmake.template"
- "${draco_build}/draco-config.cmake" @ONLY NEWLINE_STYLE UNIX)
- install(
- FILES "${draco_build}/draco-config.cmake"
- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/cmake")
+ set(bin_path "${CMAKE_INSTALL_BINDIR}")
+ set(data_path "${CMAKE_INSTALL_DATAROOTDIR}")
+ set(includes_path "${CMAKE_INSTALL_INCLUDEDIR}")
+ set(libs_path "${CMAKE_INSTALL_LIBDIR}")
foreach(file ${draco_sources})
if(file MATCHES "h$")
@@ -34,46 +34,88 @@ macro(draco_setup_install_target)
endif()
endforeach()
+ list(REMOVE_DUPLICATES draco_api_includes)
+
# Strip $draco_src_root from the file paths: we need to install relative to
# $include_directory.
list(TRANSFORM draco_api_includes REPLACE "${draco_src_root}/" "")
- set(include_directory "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
foreach(draco_api_include ${draco_api_includes})
get_filename_component(file_directory ${draco_api_include} DIRECTORY)
- set(target_directory "${include_directory}/draco/${file_directory}")
+ set(target_directory "${includes_path}/draco/${file_directory}")
install(FILES ${draco_src_root}/${draco_api_include}
DESTINATION "${target_directory}")
endforeach()
- install(
- FILES "${draco_build}/draco/draco_features.h"
- DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/draco/")
+ install(FILES "${draco_build}/draco/draco_features.h"
+ DESTINATION "${includes_path}/draco/")
- install(TARGETS draco_decoder DESTINATION
- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
- install(TARGETS draco_encoder DESTINATION
- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
+ install(TARGETS draco_decoder DESTINATION "${bin_path}")
+ install(TARGETS draco_encoder DESTINATION "${bin_path}")
+
+ if(DRACO_TRANSCODER_SUPPORTED)
+ install(TARGETS draco_transcoder DESTINATION "${bin_path}")
+ endif()
if(MSVC)
- install(TARGETS draco DESTINATION
- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+ install(
+ TARGETS draco
+ EXPORT dracoExport
+ RUNTIME DESTINATION "${bin_path}"
+ ARCHIVE DESTINATION "${libs_path}"
+ LIBRARY DESTINATION "${libs_path}")
else()
- install(TARGETS draco_static DESTINATION
- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+ install(
+ TARGETS draco_static
+ EXPORT dracoExport
+ DESTINATION "${libs_path}")
+
if(BUILD_SHARED_LIBS)
- install(TARGETS draco_shared DESTINATION
- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+ install(
+ TARGETS draco_shared
+ EXPORT dracoExport
+ RUNTIME DESTINATION "${bin_path}"
+ ARCHIVE DESTINATION "${libs_path}"
+ LIBRARY DESTINATION "${libs_path}")
endif()
endif()
if(DRACO_UNITY_PLUGIN)
- install(TARGETS dracodec_unity DESTINATION
- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
- endif()
- if(DRACO_MAYA_PLUGIN)
- install(TARGETS draco_maya_wrapper DESTINATION
- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+ install(TARGETS dracodec_unity DESTINATION "${libs_path}")
endif()
+ if(DRACO_MAYA_PLUGIN)
+ install(TARGETS draco_maya_wrapper DESTINATION "${libs_path}")
+ endif()
+
+ # pkg-config: draco.pc
+ configure_file("${draco_root}/cmake/draco.pc.template"
+ "${draco_build}/draco.pc" @ONLY NEWLINE_STYLE UNIX)
+ install(FILES "${draco_build}/draco.pc" DESTINATION "${libs_path}/pkgconfig")
+
+ # CMake config: draco-config.cmake
+ configure_package_config_file(
+ "${draco_root}/cmake/draco-config.cmake.template"
+ "${draco_build}/draco-config.cmake"
+ INSTALL_DESTINATION "${data_path}/cmake/draco")
+
+ write_basic_package_version_file(
+ "${draco_build}/draco-config-version.cmake"
+ VERSION ${DRACO_VERSION}
+ COMPATIBILITY AnyNewerVersion)
+
+ export(
+ EXPORT dracoExport
+ NAMESPACE draco::
+ FILE "${draco_build}/draco-targets.cmake")
+
+ install(
+ EXPORT dracoExport
+ NAMESPACE draco::
+ FILE draco-targets.cmake
+ DESTINATION "${data_path}/cmake/draco")
+
+ install(FILES "${draco_build}/draco-config.cmake"
+ "${draco_build}/draco-config-version.cmake"
+ DESTINATION "${data_path}/cmake/draco")
endmacro()
diff --git a/contrib/draco/cmake/draco_intrinsics.cmake b/contrib/draco/cmake/draco_intrinsics.cmake
index 9011c0de5..178df97a6 100644
--- a/contrib/draco/cmake/draco_intrinsics.cmake
+++ b/contrib/draco/cmake/draco_intrinsics.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_INTRINSICS_CMAKE_)
return()
endif() # DRACO_CMAKE_DRACO_INTRINSICS_CMAKE_
@@ -61,17 +75,15 @@ macro(draco_process_intrinsics_sources)
unset(sse4_sources)
list(APPEND sse4_sources ${arg_SOURCES})
- list(FILTER sse4_sources INCLUDE REGEX
- "${draco_sse4_source_file_suffix}$")
+ list(FILTER sse4_sources INCLUDE REGEX "${draco_sse4_source_file_suffix}$")
if(sse4_sources)
unset(sse4_flags)
- draco_get_intrinsics_flag_for_suffix(SUFFIX
- ${draco_sse4_source_file_suffix}
- VARIABLE sse4_flags)
+ draco_get_intrinsics_flag_for_suffix(
+ SUFFIX ${draco_sse4_source_file_suffix} VARIABLE sse4_flags)
if(sse4_flags)
draco_set_compiler_flags_for_sources(SOURCES ${sse4_sources} FLAGS
- ${sse4_flags})
+ ${sse4_flags})
endif()
endif()
endif()
@@ -79,17 +91,15 @@ macro(draco_process_intrinsics_sources)
if(DRACO_ENABLE_NEON AND draco_have_neon)
unset(neon_sources)
list(APPEND neon_sources ${arg_SOURCES})
- list(FILTER neon_sources INCLUDE REGEX
- "${draco_neon_source_file_suffix}$")
+ list(FILTER neon_sources INCLUDE REGEX "${draco_neon_source_file_suffix}$")
if(neon_sources AND DRACO_NEON_INTRINSICS_FLAG)
unset(neon_flags)
- draco_get_intrinsics_flag_for_suffix(SUFFIX
- ${draco_neon_source_file_suffix}
- VARIABLE neon_flags)
+ draco_get_intrinsics_flag_for_suffix(
+ SUFFIX ${draco_neon_source_file_suffix} VARIABLE neon_flags)
if(neon_flags)
draco_set_compiler_flags_for_sources(SOURCES ${neon_sources} FLAGS
- ${neon_flags})
+ ${neon_flags})
endif()
endif()
endif()
diff --git a/contrib/draco/cmake/draco_options.cmake b/contrib/draco/cmake/draco_options.cmake
index 832bfb69f..085149774 100644
--- a/contrib/draco/cmake/draco_options.cmake
+++ b/contrib/draco/cmake/draco_options.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_OPTIONS_CMAKE_)
return()
endif() # DRACO_CMAKE_DRACO_OPTIONS_CMAKE_
@@ -18,17 +32,22 @@ macro(draco_option)
cmake_parse_arguments(option "${optional_args}" "${single_value_args}"
"${multi_value_args}" ${ARGN})
- if(NOT (option_NAME AND option_HELPSTRING AND DEFINED option_VALUE))
+ if(NOT
+ (option_NAME
+ AND option_HELPSTRING
+ AND DEFINED option_VALUE))
message(FATAL_ERROR "draco_option: NAME HELPSTRING and VALUE required.")
endif()
option(${option_NAME} ${option_HELPSTRING} ${option_VALUE})
if(DRACO_VERBOSE GREATER 2)
- message("--------- draco_option ---------\n" "option_NAME=${option_NAME}\n"
- "option_HELPSTRING=${option_HELPSTRING}\n"
- "option_VALUE=${option_VALUE}\n"
- "------------------------------------------\n")
+ message(
+ "--------- draco_option ---------\n"
+ "option_NAME=${option_NAME}\n"
+ "option_HELPSTRING=${option_HELPSTRING}\n"
+ "option_VALUE=${option_VALUE}\n"
+ "------------------------------------------\n")
endif()
list(APPEND draco_options ${option_NAME})
@@ -44,33 +63,74 @@ endmacro()
# Set default options.
macro(draco_set_default_options)
- draco_option(NAME DRACO_FAST HELPSTRING "Try to build faster libs." VALUE OFF)
- draco_option(NAME DRACO_JS_GLUE HELPSTRING
- "Enable JS Glue and JS targets when using Emscripten." VALUE ON)
- draco_option(NAME DRACO_IE_COMPATIBLE HELPSTRING
- "Enable support for older IE builds when using Emscripten." VALUE
- OFF)
- draco_option(NAME DRACO_MESH_COMPRESSION HELPSTRING "Enable mesh compression."
- VALUE ON)
- draco_option(NAME DRACO_POINT_CLOUD_COMPRESSION HELPSTRING
- "Enable point cloud compression." VALUE ON)
- draco_option(NAME DRACO_PREDICTIVE_EDGEBREAKER HELPSTRING
- "Enable predictive edgebreaker." VALUE ON)
- draco_option(NAME DRACO_STANDARD_EDGEBREAKER HELPSTRING
- "Enable stand edgebreaker." VALUE ON)
- draco_option(NAME DRACO_BACKWARDS_COMPATIBILITY HELPSTRING
- "Enable backwards compatibility." VALUE ON)
- draco_option(NAME DRACO_DECODER_ATTRIBUTE_DEDUPLICATION HELPSTRING
- "Enable attribute deduping." VALUE OFF)
- draco_option(NAME DRACO_TESTS HELPSTRING "Enables tests." VALUE OFF)
- draco_option(NAME DRACO_WASM HELPSTRING "Enables WASM support." VALUE OFF)
- draco_option(NAME DRACO_UNITY_PLUGIN HELPSTRING
- "Build plugin library for Unity." VALUE OFF)
- draco_option(NAME DRACO_ANIMATION_ENCODING HELPSTRING "Enable animation."
- VALUE OFF)
- draco_option(NAME DRACO_GLTF HELPSTRING "Support GLTF." VALUE OFF)
- draco_option(NAME DRACO_MAYA_PLUGIN HELPSTRING
- "Build plugin library for Maya." VALUE OFF)
+ draco_option(
+ NAME DRACO_FAST
+ HELPSTRING "Try to build faster libs."
+ VALUE OFF)
+ draco_option(
+ NAME DRACO_JS_GLUE
+ HELPSTRING "Enable JS Glue and JS targets when using Emscripten."
+ VALUE ON)
+ draco_option(
+ NAME DRACO_IE_COMPATIBLE
+ HELPSTRING "Enable support for older IE builds when using Emscripten."
+ VALUE OFF)
+ draco_option(
+ NAME DRACO_MESH_COMPRESSION
+ HELPSTRING "Enable mesh compression."
+ VALUE ON)
+ draco_option(
+ NAME DRACO_POINT_CLOUD_COMPRESSION
+ HELPSTRING "Enable point cloud compression."
+ VALUE ON)
+ draco_option(
+ NAME DRACO_PREDICTIVE_EDGEBREAKER
+ HELPSTRING "Enable predictive edgebreaker."
+ VALUE ON)
+ draco_option(
+ NAME DRACO_STANDARD_EDGEBREAKER
+ HELPSTRING "Enable stand edgebreaker."
+ VALUE ON)
+ draco_option(
+ NAME DRACO_BACKWARDS_COMPATIBILITY
+ HELPSTRING "Enable backwards compatibility."
+ VALUE ON)
+ draco_option(
+ NAME DRACO_DECODER_ATTRIBUTE_DEDUPLICATION
+ HELPSTRING "Enable attribute deduping."
+ VALUE OFF)
+ draco_option(
+ NAME DRACO_TESTS
+ HELPSTRING "Enables tests."
+ VALUE OFF)
+ draco_option(
+ NAME DRACO_WASM
+ HELPSTRING "Enables WASM support."
+ VALUE OFF)
+ draco_option(
+ NAME DRACO_UNITY_PLUGIN
+ HELPSTRING "Build plugin library for Unity."
+ VALUE OFF)
+ draco_option(
+ NAME DRACO_ANIMATION_ENCODING
+ HELPSTRING "Enable animation."
+ VALUE OFF)
+ draco_option(
+ NAME DRACO_GLTF_BITSTREAM
+ HELPSTRING "Draco GLTF extension bitstream specified features only."
+ VALUE OFF)
+ draco_option(
+ NAME DRACO_MAYA_PLUGIN
+ HELPSTRING "Build plugin library for Maya."
+ VALUE OFF)
+ draco_option(
+ NAME DRACO_TRANSCODER_SUPPORTED
+ HELPSTRING "Enable the Draco transcoder."
+ VALUE OFF)
+ draco_option(
+ NAME DRACO_DEBUG_COMPILER_WARNINGS
+ HELPSTRING "Turn on more warnings."
+ VALUE OFF)
draco_check_deprecated_options()
endmacro()
@@ -117,14 +177,16 @@ macro(draco_check_deprecated_options)
DRACO_MAYA_PLUGIN)
draco_handle_deprecated_option(OLDNAME BUILD_USD_PLUGIN NEWNAME
BUILD_SHARED_LIBS)
+ draco_handle_deprecated_option(OLDNAME DRACO_GLTF NEWNAME
+ DRACO_GLTF_BITSTREAM)
endmacro()
# Macro for setting Draco features based on user configuration. Features enabled
# by this macro are Draco global.
macro(draco_set_optional_features)
- if(DRACO_GLTF)
- # Override settings when building for GLTF.
+ if(DRACO_GLTF_BITSTREAM)
+ # Enable only the features included in the Draco GLTF bitstream spec.
draco_enable_feature(FEATURE "DRACO_MESH_COMPRESSION_SUPPORTED")
draco_enable_feature(FEATURE "DRACO_NORMAL_ENCODING_SUPPORTED")
draco_enable_feature(FEATURE "DRACO_STANDARD_EDGEBREAKER_SUPPORTED")
@@ -170,6 +232,11 @@ macro(draco_set_optional_features)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
+ if(DRACO_TRANSCODER_SUPPORTED)
+ draco_enable_feature(FEATURE "DRACO_TRANSCODER_SUPPORTED")
+ endif()
+
+
endmacro()
# Macro that handles tracking of Draco preprocessor symbols for the purpose of
@@ -221,8 +288,56 @@ function(draco_generate_features_h)
file(APPEND "${draco_features_file_name}.new" "#define ${feature}\n")
endforeach()
+ if(MSVC)
+ if(NOT DRACO_DEBUG_COMPILER_WARNINGS)
+ file(APPEND "${draco_features_file_name}.new"
+ "// Enable DRACO_DEBUG_COMPILER_WARNINGS at CMake generation \n"
+ "// time to remove these pragmas.\n")
+
+ # warning C4018: '': signed/unsigned mismatch.
+ file(APPEND "${draco_features_file_name}.new"
+ "#pragma warning(disable:4018)\n")
+
+ # warning C4146: unary minus operator applied to unsigned type, result
+ # still unsigned
+ file(APPEND "${draco_features_file_name}.new"
+ "#pragma warning(disable:4146)\n")
+
+ # warning C4244: 'return': conversion from '' to '', possible
+ # loss of data.
+ file(APPEND "${draco_features_file_name}.new"
+ "#pragma warning(disable:4244)\n")
+
+ # warning C4267: 'initializing' conversion from '' to '',
+ # possible loss of data.
+ file(APPEND "${draco_features_file_name}.new"
+ "#pragma warning(disable:4267)\n")
+
+ # warning C4305: 'context' : truncation from 'type1' to 'type2'.
+ file(APPEND "${draco_features_file_name}.new"
+ "#pragma warning(disable:4305)\n")
+
+ # warning C4661: 'identifier' : no suitable definition provided for
+ # explicit template instantiation request.
+ file(APPEND "${draco_features_file_name}.new"
+ "#pragma warning(disable:4661)\n")
+
+ # warning C4800: Implicit conversion from 'type' to bool. Possible
+ # information loss.
+ # Also, in older MSVC releases:
+ # warning C4800: 'type' : forcing value to bool 'true' or 'false'
+ # (performance warning).
+ file(APPEND "${draco_features_file_name}.new"
+ "#pragma warning(disable:4800)\n")
+
+ # warning C4804: '': unsafe use of type '' in operation.
+ file(APPEND "${draco_features_file_name}.new"
+ "#pragma warning(disable:4804)\n")
+ endif()
+ endif()
+
file(APPEND "${draco_features_file_name}.new"
- "\n#endif // DRACO_FEATURES_H_")
+ "\n#endif // DRACO_FEATURES_H_\n")
# Will replace ${draco_features_file_name} only if the file content has
# changed. This prevents forced Draco rebuilds after CMake runs.
diff --git a/contrib/draco/cmake/draco_sanitizer.cmake b/contrib/draco/cmake/draco_sanitizer.cmake
index d2e41a6cb..77d141481 100644
--- a/contrib/draco/cmake/draco_sanitizer.cmake
+++ b/contrib/draco/cmake/draco_sanitizer.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_SANITIZER_CMAKE_)
return()
endif() # DRACO_CMAKE_DRACO_SANITIZER_CMAKE_
@@ -5,7 +19,9 @@ set(DRACO_CMAKE_DRACO_SANITIZER_CMAKE_ 1)
# Handles the details of enabling sanitizers.
macro(draco_configure_sanitizer)
- if(DRACO_SANITIZE AND NOT EMSCRIPTEN AND NOT MSVC)
+ if(DRACO_SANITIZE
+ AND NOT EMSCRIPTEN
+ AND NOT MSVC)
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if(DRACO_SANITIZE MATCHES "cfi")
list(APPEND SAN_CXX_FLAGS "-flto" "-fno-sanitize-trap=cfi")
@@ -13,8 +29,8 @@ macro(draco_configure_sanitizer)
"-fuse-ld=gold")
endif()
- if(${CMAKE_SIZEOF_VOID_P} EQUAL 4
- AND DRACO_SANITIZE MATCHES "integer|undefined")
+ if(${CMAKE_SIZEOF_VOID_P} EQUAL 4 AND DRACO_SANITIZE MATCHES
+ "integer|undefined")
list(APPEND SAN_LINKER_FLAGS "--rtlib=compiler-rt" "-lgcc_s")
endif()
endif()
diff --git a/contrib/draco/cmake/draco_targets.cmake b/contrib/draco/cmake/draco_targets.cmake
index 0456c4d7b..c8c79f511 100644
--- a/contrib/draco/cmake/draco_targets.cmake
+++ b/contrib/draco/cmake/draco_targets.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_TARGETS_CMAKE_)
return()
endif() # DRACO_CMAKE_DRACO_TARGETS_CMAKE_
@@ -51,26 +65,33 @@ macro(draco_add_executable)
unset(exe_LIB_DEPS)
set(optional_args TEST)
set(single_value_args NAME OUTPUT_NAME)
- set(multi_value_args SOURCES DEFINES INCLUDES COMPILE_FLAGS LINK_FLAGS
- OBJLIB_DEPS LIB_DEPS)
+ set(multi_value_args
+ SOURCES
+ DEFINES
+ INCLUDES
+ COMPILE_FLAGS
+ LINK_FLAGS
+ OBJLIB_DEPS
+ LIB_DEPS)
cmake_parse_arguments(exe "${optional_args}" "${single_value_args}"
"${multi_value_args}" ${ARGN})
if(DRACO_VERBOSE GREATER 1)
- message("--------- draco_add_executable ---------\n"
- "exe_TEST=${exe_TEST}\n"
- "exe_TEST_DEFINES_MAIN=${exe_TEST_DEFINES_MAIN}\n"
- "exe_NAME=${exe_NAME}\n"
- "exe_OUTPUT_NAME=${exe_OUTPUT_NAME}\n"
- "exe_SOURCES=${exe_SOURCES}\n"
- "exe_DEFINES=${exe_DEFINES}\n"
- "exe_INCLUDES=${exe_INCLUDES}\n"
- "exe_COMPILE_FLAGS=${exe_COMPILE_FLAGS}\n"
- "exe_LINK_FLAGS=${exe_LINK_FLAGS}\n"
- "exe_OBJLIB_DEPS=${exe_OBJLIB_DEPS}\n"
- "exe_LIB_DEPS=${exe_LIB_DEPS}\n"
- "------------------------------------------\n")
+ message(
+ "--------- draco_add_executable ---------\n"
+ "exe_TEST=${exe_TEST}\n"
+ "exe_TEST_DEFINES_MAIN=${exe_TEST_DEFINES_MAIN}\n"
+ "exe_NAME=${exe_NAME}\n"
+ "exe_OUTPUT_NAME=${exe_OUTPUT_NAME}\n"
+ "exe_SOURCES=${exe_SOURCES}\n"
+ "exe_DEFINES=${exe_DEFINES}\n"
+ "exe_INCLUDES=${exe_INCLUDES}\n"
+ "exe_COMPILE_FLAGS=${exe_COMPILE_FLAGS}\n"
+ "exe_LINK_FLAGS=${exe_LINK_FLAGS}\n"
+ "exe_OBJLIB_DEPS=${exe_OBJLIB_DEPS}\n"
+ "exe_LIB_DEPS=${exe_LIB_DEPS}\n"
+ "------------------------------------------\n")
endif()
if(NOT (exe_NAME AND exe_SOURCES))
@@ -87,7 +108,12 @@ macro(draco_add_executable)
endif()
add_executable(${exe_NAME} ${exe_SOURCES})
- set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION})
+
+ target_compile_features(${exe_NAME} PUBLIC cxx_std_11)
+
+ if(NOT EMSCRIPTEN)
+ set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION})
+ endif()
if(exe_OUTPUT_NAME)
set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME})
@@ -104,8 +130,8 @@ macro(draco_add_executable)
endif()
if(exe_COMPILE_FLAGS OR DRACO_CXX_FLAGS)
- target_compile_options(${exe_NAME}
- PRIVATE ${exe_COMPILE_FLAGS} ${DRACO_CXX_FLAGS})
+ target_compile_options(${exe_NAME} PRIVATE ${exe_COMPILE_FLAGS}
+ ${DRACO_CXX_FLAGS})
endif()
if(exe_LINK_FLAGS OR DRACO_EXE_LINKER_FLAGS)
@@ -113,8 +139,8 @@ macro(draco_add_executable)
list(APPEND exe_LINK_FLAGS "${DRACO_EXE_LINKER_FLAGS}")
# LINK_FLAGS is managed as a string.
draco_set_and_stringify(SOURCE "${exe_LINK_FLAGS}" DEST exe_LINK_FLAGS)
- set_target_properties(${exe_NAME}
- PROPERTIES LINK_FLAGS "${exe_LINK_FLAGS}")
+ set_target_properties(${exe_NAME} PROPERTIES LINK_FLAGS
+ "${exe_LINK_FLAGS}")
else()
target_link_options(${exe_NAME} PRIVATE ${exe_LINK_FLAGS}
${DRACO_EXE_LINKER_FLAGS})
@@ -136,12 +162,7 @@ macro(draco_add_executable)
endif()
if(exe_LIB_DEPS)
- unset(exe_static)
- if("${CMAKE_EXE_LINKER_FLAGS} ${DRACO_EXE_LINKER_FLAGS}" MATCHES "static")
- set(exe_static ON)
- endif()
-
- if(exe_static AND CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
+ if(CMAKE_CXX_COMPILER_ID MATCHES "^Clang|^GNU")
# Third party dependencies can introduce dependencies on system and test
# libraries. Since the target created here is an executable, and CMake
# does not provide a method of controlling order of link dependencies,
@@ -149,6 +170,10 @@ macro(draco_add_executable)
# ensure that dependencies of third party targets can be resolved when
# those dependencies happen to be resolved by dependencies of the current
# target.
+ # TODO(tomfinegan): For portability use LINK_GROUP with RESCAN instead of
+ # directly (ab)using compiler/linker specific flags once CMake v3.24 is in
+ # wider use. See:
+ # https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html#genex:LINK_GROUP
list(INSERT exe_LIB_DEPS 0 -Wl,--start-group)
list(APPEND exe_LIB_DEPS -Wl,--end-group)
endif()
@@ -209,27 +234,36 @@ macro(draco_add_library)
unset(lib_TARGET_PROPERTIES)
set(optional_args TEST)
set(single_value_args NAME OUTPUT_NAME TYPE)
- set(multi_value_args SOURCES DEFINES INCLUDES COMPILE_FLAGS LINK_FLAGS
- OBJLIB_DEPS LIB_DEPS PUBLIC_INCLUDES TARGET_PROPERTIES)
+ set(multi_value_args
+ SOURCES
+ DEFINES
+ INCLUDES
+ COMPILE_FLAGS
+ LINK_FLAGS
+ OBJLIB_DEPS
+ LIB_DEPS
+ PUBLIC_INCLUDES
+ TARGET_PROPERTIES)
cmake_parse_arguments(lib "${optional_args}" "${single_value_args}"
"${multi_value_args}" ${ARGN})
if(DRACO_VERBOSE GREATER 1)
- message("--------- draco_add_library ---------\n"
- "lib_TEST=${lib_TEST}\n"
- "lib_NAME=${lib_NAME}\n"
- "lib_OUTPUT_NAME=${lib_OUTPUT_NAME}\n"
- "lib_TYPE=${lib_TYPE}\n"
- "lib_SOURCES=${lib_SOURCES}\n"
- "lib_DEFINES=${lib_DEFINES}\n"
- "lib_INCLUDES=${lib_INCLUDES}\n"
- "lib_COMPILE_FLAGS=${lib_COMPILE_FLAGS}\n"
- "lib_LINK_FLAGS=${lib_LINK_FLAGS}\n"
- "lib_OBJLIB_DEPS=${lib_OBJLIB_DEPS}\n"
- "lib_LIB_DEPS=${lib_LIB_DEPS}\n"
- "lib_PUBLIC_INCLUDES=${lib_PUBLIC_INCLUDES}\n"
- "---------------------------------------\n")
+ message(
+ "--------- draco_add_library ---------\n"
+ "lib_TEST=${lib_TEST}\n"
+ "lib_NAME=${lib_NAME}\n"
+ "lib_OUTPUT_NAME=${lib_OUTPUT_NAME}\n"
+ "lib_TYPE=${lib_TYPE}\n"
+ "lib_SOURCES=${lib_SOURCES}\n"
+ "lib_DEFINES=${lib_DEFINES}\n"
+ "lib_INCLUDES=${lib_INCLUDES}\n"
+ "lib_COMPILE_FLAGS=${lib_COMPILE_FLAGS}\n"
+ "lib_LINK_FLAGS=${lib_LINK_FLAGS}\n"
+ "lib_OBJLIB_DEPS=${lib_OBJLIB_DEPS}\n"
+ "lib_LIB_DEPS=${lib_LIB_DEPS}\n"
+ "lib_PUBLIC_INCLUDES=${lib_PUBLIC_INCLUDES}\n"
+ "---------------------------------------\n")
endif()
if(NOT (lib_NAME AND lib_TYPE))
@@ -256,14 +290,24 @@ macro(draco_add_library)
endif()
add_library(${lib_NAME} ${lib_TYPE} ${lib_SOURCES})
+
+ target_compile_features(${lib_NAME} PUBLIC cxx_std_11)
+
+ target_include_directories(${lib_NAME} PUBLIC $)
+
+ if(BUILD_SHARED_LIBS)
+ # Enable PIC for all targets in shared configurations.
+ set_target_properties(${lib_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ endif()
+
if(lib_SOURCES)
draco_process_intrinsics_sources(TARGET ${lib_NAME} SOURCES ${lib_SOURCES})
endif()
if(lib_OUTPUT_NAME)
if(NOT (BUILD_SHARED_LIBS AND MSVC))
- set_target_properties(${lib_NAME}
- PROPERTIES OUTPUT_NAME ${lib_OUTPUT_NAME})
+ set_target_properties(${lib_NAME} PROPERTIES OUTPUT_NAME
+ ${lib_OUTPUT_NAME})
endif()
endif()
@@ -280,8 +324,8 @@ macro(draco_add_library)
endif()
if(lib_COMPILE_FLAGS OR DRACO_CXX_FLAGS)
- target_compile_options(${lib_NAME}
- PRIVATE ${lib_COMPILE_FLAGS} ${DRACO_CXX_FLAGS})
+ target_compile_options(${lib_NAME} PRIVATE ${lib_COMPILE_FLAGS}
+ ${DRACO_CXX_FLAGS})
endif()
if(lib_LINK_FLAGS)
@@ -320,11 +364,12 @@ macro(draco_add_library)
set_target_properties(${lib_NAME} PROPERTIES PREFIX "")
endif()
- # VERSION and SOVERSION as necessary
- if(NOT lib_TYPE STREQUAL STATIC AND NOT lib_TYPE STREQUAL MODULE)
- set_target_properties(${lib_NAME} PROPERTIES VERSION ${DRACO_VERSION})
- if(NOT MSVC)
- set_target_properties(${lib_NAME} PROPERTIES SOVERSION ${DRACO_SOVERSION})
+ if(NOT EMSCRIPTEN)
+ # VERSION and SOVERSION as necessary
+ if((lib_TYPE STREQUAL BUNDLE OR lib_TYPE STREQUAL SHARED) AND NOT MSVC)
+ set_target_properties(
+ ${lib_NAME} PROPERTIES VERSION ${DRACO_SOVERSION}
+ SOVERSION ${DRACO_SOVERSION_MAJOR})
endif()
endif()
diff --git a/contrib/draco/cmake/draco_test_config.h.cmake b/contrib/draco/cmake/draco_test_config.h.cmake
index 77a574123..9bb174569 100644
--- a/contrib/draco/cmake/draco_test_config.h.cmake
+++ b/contrib/draco/cmake/draco_test_config.h.cmake
@@ -1,3 +1,17 @@
+// Copyright 2021 The Draco Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
#ifndef DRACO_TESTING_DRACO_TEST_CONFIG_H_
#define DRACO_TESTING_DRACO_TEST_CONFIG_H_
@@ -9,5 +23,6 @@
#define DRACO_TEST_DATA_DIR "${DRACO_TEST_DATA_DIR}"
#define DRACO_TEST_TEMP_DIR "${DRACO_TEST_TEMP_DIR}"
+#define DRACO_TEST_ROOT_DIR "${DRACO_TEST_ROOT_DIR}"
#endif // DRACO_TESTING_DRACO_TEST_CONFIG_H_
diff --git a/contrib/draco/cmake/draco_tests.cmake b/contrib/draco/cmake/draco_tests.cmake
index a6dfc5b57..1d905a969 100644
--- a/contrib/draco/cmake/draco_tests.cmake
+++ b/contrib/draco/cmake/draco_tests.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_TESTS_CMAKE)
return()
endif()
@@ -10,6 +24,13 @@ set(draco_factory_test_sources
"${draco_src_root}/io/file_reader_factory_test.cc"
"${draco_src_root}/io/file_writer_factory_test.cc")
+list(
+ APPEND draco_test_common_sources
+ "${draco_src_root}/core/draco_test_base.h"
+ "${draco_src_root}/core/draco_test_utils.cc"
+ "${draco_src_root}/core/draco_test_utils.h"
+ "${draco_src_root}/core/status.cc")
+
list(
APPEND
draco_test_sources
@@ -30,22 +51,23 @@ list(
"${draco_src_root}/compression/point_cloud/point_cloud_kd_tree_encoding_test.cc"
"${draco_src_root}/compression/point_cloud/point_cloud_sequential_encoding_test.cc"
"${draco_src_root}/core/buffer_bit_coding_test.cc"
- "${draco_src_root}/core/draco_test_base.h"
- "${draco_src_root}/core/draco_test_utils.cc"
- "${draco_src_root}/core/draco_test_utils.h"
"${draco_src_root}/core/math_utils_test.cc"
"${draco_src_root}/core/quantization_utils_test.cc"
"${draco_src_root}/core/status_test.cc"
"${draco_src_root}/core/vector_d_test.cc"
"${draco_src_root}/io/file_reader_test_common.h"
"${draco_src_root}/io/file_utils_test.cc"
+ "${draco_src_root}/io/file_writer_utils_test.cc"
"${draco_src_root}/io/stdio_file_reader_test.cc"
"${draco_src_root}/io/stdio_file_writer_test.cc"
"${draco_src_root}/io/obj_decoder_test.cc"
"${draco_src_root}/io/obj_encoder_test.cc"
"${draco_src_root}/io/ply_decoder_test.cc"
"${draco_src_root}/io/ply_reader_test.cc"
+ "${draco_src_root}/io/stl_decoder_test.cc"
+ "${draco_src_root}/io/stl_encoder_test.cc"
"${draco_src_root}/io/point_cloud_io_test.cc"
+ "${draco_src_root}/mesh/corner_table_test.cc"
"${draco_src_root}/mesh/mesh_are_equivalent_test.cc"
"${draco_src_root}/mesh/mesh_cleanup_test.cc"
"${draco_src_root}/mesh/triangle_soup_mesh_builder_test.cc"
@@ -54,47 +76,71 @@ list(
"${draco_src_root}/point_cloud/point_cloud_builder_test.cc"
"${draco_src_root}/point_cloud/point_cloud_test.cc")
-list(APPEND draco_gtest_all
- "${draco_root}/../googletest/googletest/src/gtest-all.cc")
-list(APPEND draco_gtest_main
- "${draco_root}/../googletest/googletest/src/gtest_main.cc")
+if(DRACO_TRANSCODER_SUPPORTED)
+ list(
+ APPEND draco_test_sources
+ "${draco_src_root}/animation/animation_test.cc"
+ "${draco_src_root}/io/gltf_decoder_test.cc"
+ "${draco_src_root}/io/gltf_encoder_test.cc"
+ "${draco_src_root}/io/gltf_utils_test.cc"
+ "${draco_src_root}/io/gltf_test_helper.cc"
+ "${draco_src_root}/io/gltf_test_helper.h"
+ "${draco_src_root}/io/scene_io_test.cc"
+ "${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_table_test.cc"
+ "${draco_src_root}/metadata/structural_metadata_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"
+ "${draco_src_root}/scene/scene_test.cc"
+ "${draco_src_root}/scene/scene_are_equivalent_test.cc"
+ "${draco_src_root}/scene/scene_utils_test.cc"
+ "${draco_src_root}/scene/trs_matrix_test.cc"
+ "${draco_src_root}/texture/texture_library_test.cc"
+ "${draco_src_root}/texture/texture_map_test.cc"
+ "${draco_src_root}/texture/texture_transform_test.cc")
+
+endif()
macro(draco_setup_test_targets)
if(DRACO_TESTS)
+ draco_setup_googletest()
+
if(NOT (EXISTS ${draco_gtest_all} AND EXISTS ${draco_gtest_main}))
- message(FATAL "googletest must be a sibling directory of ${draco_root}.")
+ message(FATAL_ERROR "googletest missing, run git submodule update --init")
endif()
list(APPEND draco_test_defines GTEST_HAS_PTHREAD=0)
- draco_add_library(TEST
- NAME
- draco_gtest
- TYPE
- STATIC
- SOURCES
- ${draco_gtest_all}
- DEFINES
- ${draco_defines}
- ${draco_test_defines}
- INCLUDES
- ${draco_test_include_paths})
+ draco_add_library(
+ TEST
+ NAME draco_test_common
+ TYPE STATIC
+ SOURCES ${draco_test_common_sources}
+ DEFINES ${draco_defines} ${draco_test_defines}
+ INCLUDES ${draco_test_include_paths})
- draco_add_library(TEST
- NAME
- draco_gtest_main
- TYPE
- STATIC
- SOURCES
- ${draco_gtest_main}
- DEFINES
- ${draco_defines}
- ${draco_test_defines}
- INCLUDES
- ${draco_test_include_paths})
+ draco_add_library(
+ TEST
+ NAME draco_gtest
+ TYPE STATIC
+ SOURCES ${draco_gtest_all}
+ DEFINES ${draco_defines} ${draco_test_defines}
+ INCLUDES ${draco_test_include_paths})
+
+ draco_add_library(
+ TEST
+ NAME draco_gtest_main
+ TYPE STATIC
+ SOURCES ${draco_gtest_main}
+ DEFINES ${draco_defines} ${draco_test_defines}
+ INCLUDES ${draco_test_include_paths})
set(DRACO_TEST_DATA_DIR "${draco_root}/testdata")
set(DRACO_TEST_TEMP_DIR "${draco_build}/draco_test_temp")
+ set(DRACO_TEST_ROOT_DIR "${draco_root}")
file(MAKE_DIRECTORY "${DRACO_TEST_TEMP_DIR}")
# Sets DRACO_TEST_DATA_DIR and DRACO_TEST_TEMP_DIR.
@@ -102,32 +148,24 @@ macro(draco_setup_test_targets)
"${draco_build}/testing/draco_test_config.h")
# Create the test targets.
- draco_add_executable(NAME
- draco_tests
- SOURCES
- ${draco_test_sources}
- DEFINES
- ${draco_defines}
- ${draco_test_defines}
- INCLUDES
- ${draco_test_include_paths}
- LIB_DEPS
- draco_static
- draco_gtest
- draco_gtest_main)
+ draco_add_executable(
+ TEST
+ NAME draco_tests
+ SOURCES ${draco_test_sources}
+ DEFINES ${draco_defines} ${draco_test_defines}
+ INCLUDES ${draco_test_include_paths}
+ LIB_DEPS ${draco_dependency} draco_gtest draco_gtest_main
+ draco_test_common)
+
+ draco_add_executable(
+ TEST
+ NAME draco_factory_tests
+ SOURCES ${draco_factory_test_sources}
+ DEFINES ${draco_defines} ${draco_test_defines}
+ INCLUDES ${draco_test_include_paths}
+ LIB_DEPS ${draco_dependency} draco_gtest draco_gtest_main
+ draco_test_common)
+
- draco_add_executable(NAME
- draco_factory_tests
- SOURCES
- ${draco_factory_test_sources}
- DEFINES
- ${draco_defines}
- ${draco_test_defines}
- INCLUDES
- ${draco_test_include_paths}
- LIB_DEPS
- draco_static
- draco_gtest
- draco_gtest_main)
endif()
endmacro()
diff --git a/contrib/draco/cmake/draco_variables.cmake b/contrib/draco/cmake/draco_variables.cmake
index 8dbc77a53..6d1b6a99d 100644
--- a/contrib/draco/cmake/draco_variables.cmake
+++ b/contrib/draco/cmake/draco_variables.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_DRACO_VARIABLES_CMAKE_)
return()
endif() # DRACO_CMAKE_DRACO_VARIABLES_CMAKE_
@@ -14,8 +28,7 @@ macro(draco_variable_must_be_directory variable_name)
if("${${variable_name}}" STREQUAL "")
message(
- FATAL_ERROR
- "Empty variable ${variable_name} is required to build draco.")
+ FATAL_ERROR "Empty variable ${variable_name} is required to build draco.")
endif()
if(NOT IS_DIRECTORY "${${variable_name}}")
@@ -44,11 +57,13 @@ macro(draco_dump_cmake_flag_variables)
list(APPEND flag_variables "CMAKE_CXX_FLAGS_INIT" "CMAKE_CXX_FLAGS"
"CMAKE_EXE_LINKER_FLAGS_INIT" "CMAKE_EXE_LINKER_FLAGS")
if(CMAKE_BUILD_TYPE)
- list(APPEND flag_variables "CMAKE_BUILD_TYPE"
- "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}_INIT"
- "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}"
- "CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE}_INIT"
- "CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE}")
+ list(
+ APPEND flag_variables
+ "CMAKE_BUILD_TYPE"
+ "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}_INIT"
+ "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}"
+ "CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE}_INIT"
+ "CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE}")
endif()
foreach(flag_variable ${flag_variables})
message("${flag_variable}:${${flag_variable}}")
diff --git a/contrib/draco/cmake/sanitizers.cmake b/contrib/draco/cmake/sanitizers.cmake
deleted file mode 100644
index e720bc045..000000000
--- a/contrib/draco/cmake/sanitizers.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-if(DRACO_CMAKE_SANITIZERS_CMAKE_)
- return()
-endif()
-set(DRACO_CMAKE_SANITIZERS_CMAKE_ 1)
-
-if(MSVC OR NOT SANITIZE)
- return()
-endif()
-
-include("${draco_root}/cmake/compiler_flags.cmake")
-
-string(TOLOWER ${SANITIZE} SANITIZE)
-
-# Require the sanitizer requested.
-require_linker_flag("-fsanitize=${SANITIZE}")
-require_compiler_flag("-fsanitize=${SANITIZE}" YES)
-
-# Make callstacks accurate.
-require_compiler_flag("-fno-omit-frame-pointer -fno-optimize-sibling-calls" YES)
diff --git a/contrib/draco/cmake/toolchains/aarch64-linux-gnu.cmake b/contrib/draco/cmake/toolchains/aarch64-linux-gnu.cmake
index 87e0b4a45..a55da20fa 100644
--- a/contrib/draco/cmake/toolchains/aarch64-linux-gnu.cmake
+++ b/contrib/draco/cmake/toolchains/aarch64-linux-gnu.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_AARCH64_LINUX_GNU_CMAKE_)
return()
endif() # DRACO_CMAKE_TOOLCHAINS_AARCH64_LINUX_GNU_CMAKE_
diff --git a/contrib/draco/cmake/toolchains/android-ndk-common.cmake b/contrib/draco/cmake/toolchains/android-ndk-common.cmake
index 5126d6e29..80396af48 100644
--- a/contrib/draco/cmake/toolchains/android-ndk-common.cmake
+++ b/contrib/draco/cmake/toolchains/android-ndk-common.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_ANDROID_NDK_COMMON_CMAKE_)
return()
endif()
diff --git a/contrib/draco/cmake/toolchains/android.cmake b/contrib/draco/cmake/toolchains/android.cmake
index b8f576d5e..ba50576b7 100644
--- a/contrib/draco/cmake/toolchains/android.cmake
+++ b/contrib/draco/cmake/toolchains/android.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_ANDROID_CMAKE_)
return()
endif() # DRACO_CMAKE_TOOLCHAINS_ANDROID_CMAKE_
@@ -16,9 +30,9 @@ if(NOT ANDROID_ABI)
set(ANDROID_ABI arm64-v8a)
endif()
-# Force arm mode for 32-bit targets (instead of the default thumb) to improve
-# performance.
-if(NOT ANDROID_ARM_MODE)
+# Force arm mode for 32-bit arm targets (instead of the default thumb) to
+# improve performance.
+if(ANDROID_ABI MATCHES "^armeabi" AND NOT ANDROID_ARM_MODE)
set(ANDROID_ARM_MODE arm)
endif()
diff --git a/contrib/draco/cmake/toolchains/arm-ios-common.cmake b/contrib/draco/cmake/toolchains/arm-ios-common.cmake
index 65326d1c2..fab54bb39 100644
--- a/contrib/draco/cmake/toolchains/arm-ios-common.cmake
+++ b/contrib/draco/cmake/toolchains/arm-ios-common.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_ARM_IOS_COMMON_CMAKE_)
return()
endif()
@@ -13,5 +27,3 @@ set(CMAKE_C_COMPILER clang)
set(CMAKE_C_COMPILER_ARG1 "-arch ${CMAKE_SYSTEM_PROCESSOR}")
set(CMAKE_CXX_COMPILER clang++)
set(CMAKE_CXX_COMPILER_ARG1 "-arch ${CMAKE_SYSTEM_PROCESSOR}")
-
-# TODO(tomfinegan): Handle bit code embedding.
diff --git a/contrib/draco/cmake/toolchains/arm-linux-gnueabihf.cmake b/contrib/draco/cmake/toolchains/arm-linux-gnueabihf.cmake
index 6e45969e9..f1f83d67c 100644
--- a/contrib/draco/cmake/toolchains/arm-linux-gnueabihf.cmake
+++ b/contrib/draco/cmake/toolchains/arm-linux-gnueabihf.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_ARM_LINUX_GNUEABIHF_CMAKE_)
return()
endif() # DRACO_CMAKE_TOOLCHAINS_ARM_LINUX_GNUEABIHF_CMAKE_
diff --git a/contrib/draco/cmake/toolchains/arm64-android-ndk-libcpp.cmake b/contrib/draco/cmake/toolchains/arm64-android-ndk-libcpp.cmake
index 4b6d366f0..80d452f97 100644
--- a/contrib/draco/cmake/toolchains/arm64-android-ndk-libcpp.cmake
+++ b/contrib/draco/cmake/toolchains/arm64-android-ndk-libcpp.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_ARM64_ANDROID_NDK_LIBCPP_CMAKE_)
return()
endif()
diff --git a/contrib/draco/cmake/toolchains/arm64-ios.cmake b/contrib/draco/cmake/toolchains/arm64-ios.cmake
index c4ec7e3fa..5365d70f1 100644
--- a/contrib/draco/cmake/toolchains/arm64-ios.cmake
+++ b/contrib/draco/cmake/toolchains/arm64-ios.cmake
@@ -1,10 +1,23 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_ARM64_IOS_CMAKE_)
return()
endif()
set(DRACO_CMAKE_TOOLCHAINS_ARM64_IOS_CMAKE_ 1)
if(XCODE)
- # TODO(tomfinegan): Handle arm builds in Xcode.
message(FATAL_ERROR "This toolchain does not support Xcode.")
endif()
diff --git a/contrib/draco/cmake/toolchains/arm64-linux-gcc.cmake b/contrib/draco/cmake/toolchains/arm64-linux-gcc.cmake
index 046ff0139..a332760b2 100644
--- a/contrib/draco/cmake/toolchains/arm64-linux-gcc.cmake
+++ b/contrib/draco/cmake/toolchains/arm64-linux-gcc.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_ARM64_LINUX_GCC_CMAKE_)
return()
endif()
diff --git a/contrib/draco/cmake/toolchains/armv7-android-ndk-libcpp.cmake b/contrib/draco/cmake/toolchains/armv7-android-ndk-libcpp.cmake
index 80ee98b18..bedcc0cad 100644
--- a/contrib/draco/cmake/toolchains/armv7-android-ndk-libcpp.cmake
+++ b/contrib/draco/cmake/toolchains/armv7-android-ndk-libcpp.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_ARMV7_ANDROID_NDK_LIBCPP_CMAKE_)
return()
endif()
diff --git a/contrib/draco/cmake/toolchains/armv7-ios.cmake b/contrib/draco/cmake/toolchains/armv7-ios.cmake
index 8ddd6997b..43e208b1f 100644
--- a/contrib/draco/cmake/toolchains/armv7-ios.cmake
+++ b/contrib/draco/cmake/toolchains/armv7-ios.cmake
@@ -1,10 +1,23 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_)
return()
endif()
set(DRACO_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_ 1)
if(XCODE)
- # TODO(tomfinegan): Handle arm builds in Xcode.
message(FATAL_ERROR "This toolchain does not support Xcode.")
endif()
diff --git a/contrib/draco/cmake/toolchains/armv7-linux-gcc.cmake b/contrib/draco/cmake/toolchains/armv7-linux-gcc.cmake
index 9c9472319..730a87f4b 100644
--- a/contrib/draco/cmake/toolchains/armv7-linux-gcc.cmake
+++ b/contrib/draco/cmake/toolchains/armv7-linux-gcc.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_ARMV7_LINUX_GCC_CMAKE_)
return()
endif()
diff --git a/contrib/draco/cmake/toolchains/armv7s-ios.cmake b/contrib/draco/cmake/toolchains/armv7s-ios.cmake
index b433025ba..472756117 100644
--- a/contrib/draco/cmake/toolchains/armv7s-ios.cmake
+++ b/contrib/draco/cmake/toolchains/armv7s-ios.cmake
@@ -1,10 +1,23 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_)
return()
endif()
set(DRACO_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_ 1)
if(XCODE)
- # TODO(tomfinegan): Handle arm builds in Xcode.
message(FATAL_ERROR "This toolchain does not support Xcode.")
endif()
diff --git a/contrib/draco/cmake/toolchains/i386-ios.cmake b/contrib/draco/cmake/toolchains/i386-ios.cmake
index e9a105591..38989d225 100644
--- a/contrib/draco/cmake/toolchains/i386-ios.cmake
+++ b/contrib/draco/cmake/toolchains/i386-ios.cmake
@@ -1,10 +1,23 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_i386_IOS_CMAKE_)
return()
endif()
set(DRACO_CMAKE_TOOLCHAINS_i386_IOS_CMAKE_ 1)
if(XCODE)
- # TODO(tomfinegan): Handle arm builds in Xcode.
message(FATAL_ERROR "This toolchain does not support Xcode.")
endif()
diff --git a/contrib/draco/cmake/toolchains/x86-android-ndk-libcpp.cmake b/contrib/draco/cmake/toolchains/x86-android-ndk-libcpp.cmake
index d43383640..6f63f2c31 100644
--- a/contrib/draco/cmake/toolchains/x86-android-ndk-libcpp.cmake
+++ b/contrib/draco/cmake/toolchains/x86-android-ndk-libcpp.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_X86_ANDROID_NDK_LIBCPP_CMAKE_)
return()
endif()
diff --git a/contrib/draco/cmake/toolchains/x86_64-android-ndk-libcpp.cmake b/contrib/draco/cmake/toolchains/x86_64-android-ndk-libcpp.cmake
index d6fabeacc..7a630f4d4 100644
--- a/contrib/draco/cmake/toolchains/x86_64-android-ndk-libcpp.cmake
+++ b/contrib/draco/cmake/toolchains/x86_64-android-ndk-libcpp.cmake
@@ -1,3 +1,17 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_X86_64_ANDROID_NDK_LIBCPP_CMAKE_)
return()
endif()
diff --git a/contrib/draco/cmake/toolchains/x86_64-ios.cmake b/contrib/draco/cmake/toolchains/x86_64-ios.cmake
index 4c50a72a2..6946ce410 100644
--- a/contrib/draco/cmake/toolchains/x86_64-ios.cmake
+++ b/contrib/draco/cmake/toolchains/x86_64-ios.cmake
@@ -1,10 +1,23 @@
+# Copyright 2021 The Draco Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
if(DRACO_CMAKE_TOOLCHAINS_X86_64_IOS_CMAKE_)
return()
endif()
set(DRACO_CMAKE_TOOLCHAINS_X86_64_IOS_CMAKE_ 1)
if(XCODE)
- # TODO(tomfinegan): Handle arm builds in Xcode.
message(FATAL_ERROR "This toolchain does not support Xcode.")
endif()
diff --git a/contrib/draco/cmake/util.cmake b/contrib/draco/cmake/util.cmake
deleted file mode 100644
index 813146a62..000000000
--- a/contrib/draco/cmake/util.cmake
+++ /dev/null
@@ -1,79 +0,0 @@
-if(DRACO_CMAKE_UTIL_CMAKE_)
- return()
-endif()
-set(DRACO_CMAKE_UTIL_CMAKE_ 1)
-
-# Creates dummy source file in $draco_build_dir named $basename.$extension and
-# returns the full path to the dummy source file via the $out_file_path
-# parameter.
-function(create_dummy_source_file basename extension out_file_path)
- set(dummy_source_file "${draco_build_dir}/${basename}.${extension}")
- file(WRITE "${dummy_source_file}.new"
- "// Generated file. DO NOT EDIT!\n"
- "// ${target_name} needs a ${extension} file to force link language, \n"
- "// or to silence a harmless CMake warning: Ignore me.\n"
- "void ${target_name}_dummy_function(void) {}\n")
-
- # Will replace ${dummy_source_file} only if the file content has changed.
- # This prevents forced Draco rebuilds after CMake runs.
- configure_file("${dummy_source_file}.new" "${dummy_source_file}")
- file(REMOVE "${dummy_source_file}.new")
-
- set(${out_file_path} ${dummy_source_file} PARENT_SCOPE)
-endfunction()
-
-# Convenience function for adding a dummy source file to $target_name using
-# $extension as the file extension. Wraps create_dummy_source_file().
-function(add_dummy_source_file_to_target target_name extension)
- create_dummy_source_file("${target_name}" "${extension}" "dummy_source_file")
- target_sources(${target_name} PRIVATE ${dummy_source_file})
-endfunction()
-
-# Extracts the version number from $version_file and returns it to the user via
-# $version_string_out_var. This is achieved by finding the first instance of the
-# kDracoVersion variable and then removing everything but the string literal
-# assigned to the variable. Quotes and semicolon are stripped from the returned
-# string.
-function(extract_version_string version_file version_string_out_var)
- file(STRINGS "${version_file}" draco_version REGEX "kDracoVersion")
- list(GET draco_version 0 draco_version)
- string(REPLACE "static const char kDracoVersion[] = " "" draco_version
- "${draco_version}")
- string(REPLACE ";" "" draco_version "${draco_version}")
- string(REPLACE "\"" "" draco_version "${draco_version}")
- set("${version_string_out_var}" "${draco_version}" PARENT_SCOPE)
-endfunction()
-
-# Sets CMake compiler launcher to $launcher_name when $launcher_name is found in
-# $PATH. Warns user about ignoring build flag $launcher_flag when $launcher_name
-# is not found in $PATH.
-function(set_compiler_launcher launcher_flag launcher_name)
- find_program(launcher_path "${launcher_name}")
- if(launcher_path)
- set(CMAKE_C_COMPILER_LAUNCHER "${launcher_path}" PARENT_SCOPE)
- set(CMAKE_CXX_COMPILER_LAUNCHER "${launcher_path}" PARENT_SCOPE)
- message("--- Using ${launcher_name} as compiler launcher.")
- else()
- message(
- WARNING "--- Cannot find ${launcher_name}, ${launcher_flag} ignored.")
- endif()
-endfunction()
-
-# Terminates CMake execution when $var_name is unset in the environment. Sets
-# CMake variable to the value of the environment variable when the variable is
-# present in the environment.
-macro(require_variable var_name)
- if("$ENV{${var_name}}" STREQUAL "")
- message(FATAL_ERROR "${var_name} must be set in environment.")
- endif()
- set_variable_if_unset(${var_name} "")
-endmacro()
-
-# Sets $var_name to $default_value if not already set.
-macro(set_variable_if_unset var_name default_value)
- if(NOT "$ENV{${var_name}}" STREQUAL "")
- set(${var_name} $ENV{${var_name}})
- elseif(NOT ${var_name})
- set(${var_name} ${default_value})
- endif()
-endmacro()
diff --git a/contrib/draco/src/draco/animation/animation.cc b/contrib/draco/src/draco/animation/animation.cc
new file mode 100644
index 000000000..471cf2942
--- /dev/null
+++ b/contrib/draco/src/draco/animation/animation.cc
@@ -0,0 +1,47 @@
+// Copyright 2019 The Draco Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#include "draco/animation/animation.h"
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+namespace draco {
+
+void Animation::Copy(const Animation &src) {
+ name_ = src.name_;
+ channels_.clear();
+ for (int i = 0; i < src.NumChannels(); ++i) {
+ std::unique_ptr new_channel(new AnimationChannel());
+ new_channel->Copy(*src.GetChannel(i));
+ channels_.push_back(std::move(new_channel));
+ }
+
+ samplers_.clear();
+ for (int i = 0; i < src.NumSamplers(); ++i) {
+ std::unique_ptr new_sampler(new AnimationSampler());
+ new_sampler->Copy(*src.GetSampler(i));
+ samplers_.push_back(std::move(new_sampler));
+ }
+
+ node_animation_data_.clear();
+ for (int i = 0; i < src.NumNodeAnimationData(); ++i) {
+ std::unique_ptr new_data(new NodeAnimationData());
+ new_data->Copy(*src.GetNodeAnimationData(i));
+ node_animation_data_.push_back(std::move(new_data));
+ }
+}
+
+} // namespace draco
+
+#endif // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/animation/animation.h b/contrib/draco/src/draco/animation/animation.h
new file mode 100644
index 000000000..3713f9886
--- /dev/null
+++ b/contrib/draco/src/draco/animation/animation.h
@@ -0,0 +1,149 @@
+// Copyright 2019 The Draco Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#ifndef DRACO_ANIMATION_ANIMATION_H_
+#define DRACO_ANIMATION_ANIMATION_H_
+
+#include "draco/draco_features.h"
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+#include
+#include
+
+#include "draco/animation/node_animation_data.h"
+#include "draco/core/status.h"
+
+namespace draco {
+
+// Struct to hold information about an animation's sampler.
+struct AnimationSampler {
+ enum class SamplerInterpolation { LINEAR, STEP, CUBICSPLINE };
+
+ static std::string InterpolationToString(SamplerInterpolation value) {
+ switch (value) {
+ case SamplerInterpolation::STEP:
+ return "STEP";
+ case SamplerInterpolation::CUBICSPLINE:
+ return "CUBICSPLINE";
+ default:
+ return "LINEAR";
+ }
+ }
+
+ AnimationSampler()
+ : input_index(-1),
+ interpolation_type(SamplerInterpolation::LINEAR),
+ output_index(-1) {}
+
+ void Copy(const AnimationSampler &src) {
+ input_index = src.input_index;
+ interpolation_type = src.interpolation_type;
+ output_index = src.output_index;
+ }
+
+ int input_index;
+ SamplerInterpolation interpolation_type;
+ int output_index;
+};
+
+// Struct to hold information about an animation's channel.
+struct AnimationChannel {
+ enum class ChannelTransformation { TRANSLATION, ROTATION, SCALE, WEIGHTS };
+
+ static std::string TransformationToString(ChannelTransformation value) {
+ switch (value) {
+ case ChannelTransformation::ROTATION:
+ return "rotation";
+ case ChannelTransformation::SCALE:
+ return "scale";
+ case ChannelTransformation::WEIGHTS:
+ return "weights";
+ default:
+ return "translation";
+ }
+ }
+
+ AnimationChannel()
+ : target_index(-1),
+ transformation_type(ChannelTransformation::TRANSLATION),
+ sampler_index(-1) {}
+
+ void Copy(const AnimationChannel &src) {
+ target_index = src.target_index;
+ transformation_type = src.transformation_type;
+ sampler_index = src.sampler_index;
+ }
+
+ int target_index;
+ ChannelTransformation transformation_type;
+ int sampler_index;
+};
+
+// This class is used to hold data and information of glTF animations.
+class Animation {
+ public:
+ Animation() {}
+
+ void Copy(const Animation &src);
+
+ const std::string &GetName() const { return name_; }
+ void SetName(const std::string &name) { name_ = name; }
+
+ // Returns the number of channels in an animation.
+ int NumChannels() const { return channels_.size(); }
+ // Returns the number of samplers in an animation.
+ int NumSamplers() const { return samplers_.size(); }
+ // Returns the number of accessors in an animation.
+ int NumNodeAnimationData() const { return node_animation_data_.size(); }
+
+ // Returns a channel in the animation.
+ AnimationChannel *GetChannel(int index) { return channels_[index].get(); }
+ const AnimationChannel *GetChannel(int index) const {
+ return channels_[index].get();
+ }
+ // Returns a sampler in the animation.
+ AnimationSampler *GetSampler(int index) { return samplers_[index].get(); }
+ const AnimationSampler *GetSampler(int index) const {
+ return samplers_[index].get();
+ }
+ // Returns an accessor in the animation.
+ NodeAnimationData *GetNodeAnimationData(int index) {
+ return node_animation_data_[index].get();
+ }
+ const NodeAnimationData *GetNodeAnimationData(int index) const {
+ return node_animation_data_[index].get();
+ }
+
+ void AddNodeAnimationData(
+ std::unique_ptr node_animation_data) {
+ node_animation_data_.push_back(std::move(node_animation_data));
+ }
+ void AddSampler(std::unique_ptr sampler) {
+ samplers_.push_back(std::move(sampler));
+ }
+ void AddChannel(std::unique_ptr channel) {
+ channels_.push_back(std::move(channel));
+ }
+
+ private:
+ std::string name_;
+ std::vector> samplers_;
+ std::vector> channels_;
+ std::vector> node_animation_data_;
+};
+
+} // namespace draco
+
+#endif // DRACO_TRANSCODER_SUPPORTED
+#endif // DRACO_ANIMATION_ANIMATION_H_
diff --git a/contrib/draco/src/draco/animation/animation_test.cc b/contrib/draco/src/draco/animation/animation_test.cc
new file mode 100644
index 000000000..473938bca
--- /dev/null
+++ b/contrib/draco/src/draco/animation/animation_test.cc
@@ -0,0 +1,71 @@
+// Copyright 2021 The Draco Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#include "draco/animation/animation.h"
+
+#include "draco/core/draco_test_base.h"
+#include "draco/draco_features.h"
+
+namespace {
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+TEST(AnimationTest, TestCopy) {
+ // Test copying of animation data.
+ draco::Animation src_anim;
+ ASSERT_TRUE(src_anim.GetName().empty());
+ src_anim.SetName("Walking");
+ ASSERT_EQ(src_anim.GetName(), "Walking");
+
+ std::unique_ptr src_sampler_0(
+ new draco::AnimationSampler());
+ src_sampler_0->interpolation_type =
+ draco::AnimationSampler::SamplerInterpolation::CUBICSPLINE;
+ std::unique_ptr src_sampler_1(
+ new draco::AnimationSampler());
+ src_sampler_1->Copy(*src_sampler_0);
+
+ ASSERT_EQ(src_sampler_0->interpolation_type,
+ src_sampler_1->interpolation_type);
+
+ src_sampler_1->interpolation_type =
+ draco::AnimationSampler::SamplerInterpolation::STEP;
+
+ src_anim.AddSampler(std::move(src_sampler_0));
+ src_anim.AddSampler(std::move(src_sampler_1));
+ ASSERT_EQ(src_anim.NumSamplers(), 2);
+
+ std::unique_ptr src_channel(
+ new draco::AnimationChannel());
+ src_channel->transformation_type =
+ draco::AnimationChannel::ChannelTransformation::WEIGHTS;
+ src_anim.AddChannel(std::move(src_channel));
+ ASSERT_EQ(src_anim.NumChannels(), 1);
+
+ draco::Animation dst_anim;
+ dst_anim.Copy(src_anim);
+
+ ASSERT_EQ(dst_anim.GetName(), src_anim.GetName());
+ ASSERT_EQ(dst_anim.NumSamplers(), 2);
+ ASSERT_EQ(dst_anim.NumChannels(), 1);
+
+ ASSERT_EQ(dst_anim.GetSampler(0)->interpolation_type,
+ src_anim.GetSampler(0)->interpolation_type);
+ ASSERT_EQ(dst_anim.GetSampler(1)->interpolation_type,
+ src_anim.GetSampler(1)->interpolation_type);
+ ASSERT_EQ(dst_anim.GetChannel(0)->transformation_type,
+ src_anim.GetChannel(0)->transformation_type);
+}
+#endif // DRACO_TRANSCODER_SUPPORTED
+
+} // namespace
diff --git a/contrib/draco/src/draco/animation/keyframe_animation_encoding_test.cc b/contrib/draco/src/draco/animation/keyframe_animation_encoding_test.cc
index 4a6491f9d..fcd0eaa6f 100644
--- a/contrib/draco/src/draco/animation/keyframe_animation_encoding_test.cc
+++ b/contrib/draco/src/draco/animation/keyframe_animation_encoding_test.cc
@@ -26,8 +26,9 @@ class KeyframeAnimationEncodingTest : public ::testing::Test {
bool CreateAndAddTimestamps(int32_t num_frames) {
timestamps_.resize(num_frames);
- for (int i = 0; i < timestamps_.size(); ++i)
+ for (int i = 0; i < timestamps_.size(); ++i) {
timestamps_[i] = static_cast(i);
+ }
return keyframe_animation_.SetTimestamps(timestamps_);
}
@@ -35,8 +36,9 @@ class KeyframeAnimationEncodingTest : public ::testing::Test {
uint32_t num_components) {
// Create and add animation data with.
animation_data_.resize(num_frames * num_components);
- for (int i = 0; i < animation_data_.size(); ++i)
+ for (int i = 0; i < animation_data_.size(); ++i) {
animation_data_[i] = static_cast(i);
+ }
return keyframe_animation_.AddKeyframes(draco::DT_FLOAT32, num_components,
animation_data_);
}
@@ -49,7 +51,7 @@ class KeyframeAnimationEncodingTest : public ::testing::Test {
ASSERT_EQ(animation0.num_animations(), animation1.num_animations());
if (quantized) {
- // TODO(hemmer) : Add test for stable quantization.
+ // TODO(b/199760123) : Add test for stable quantization.
// Quantization will result in slightly different values.
// Skip comparing values.
return;
@@ -109,9 +111,8 @@ class KeyframeAnimationEncodingTest : public ::testing::Test {
}
}
- ASSERT_TRUE(
- encoder.EncodeKeyframeAnimation(keyframe_animation_, options, &buffer)
- .ok());
+ DRACO_ASSERT_OK(
+ encoder.EncodeKeyframeAnimation(keyframe_animation_, options, &buffer));
draco::DecoderBuffer dec_decoder;
draco::KeyframeAnimationDecoder decoder;
@@ -122,8 +123,8 @@ class KeyframeAnimationEncodingTest : public ::testing::Test {
std::unique_ptr decoded_animation(
new KeyframeAnimation());
DecoderOptions dec_options;
- ASSERT_TRUE(
- decoder.Decode(dec_options, &dec_buffer, decoded_animation.get()).ok());
+ DRACO_ASSERT_OK(
+ decoder.Decode(dec_options, &dec_buffer, decoded_animation.get()));
// Verify if animation before and after compression is identical.
CompareAnimationData(keyframe_animation_,
diff --git a/contrib/draco/src/draco/animation/keyframe_animation_test.cc b/contrib/draco/src/draco/animation/keyframe_animation_test.cc
index bc92b25ff..94566972b 100644
--- a/contrib/draco/src/draco/animation/keyframe_animation_test.cc
+++ b/contrib/draco/src/draco/animation/keyframe_animation_test.cc
@@ -24,8 +24,9 @@ class KeyframeAnimationTest : public ::testing::Test {
bool CreateAndAddTimestamps(int32_t num_frames) {
timestamps_.resize(num_frames);
- for (int i = 0; i < timestamps_.size(); ++i)
+ for (int i = 0; i < timestamps_.size(); ++i) {
timestamps_[i] = static_cast(i);
+ }
return keyframe_animation_.SetTimestamps(timestamps_);
}
@@ -33,8 +34,9 @@ class KeyframeAnimationTest : public ::testing::Test {
uint32_t num_components) {
// Create and add animation data with.
animation_data_.resize(num_frames * num_components);
- for (int i = 0; i < animation_data_.size(); ++i)
+ for (int i = 0; i < animation_data_.size(); ++i) {
animation_data_[i] = static_cast(i);
+ }
return keyframe_animation_.AddKeyframes(draco::DT_FLOAT32, num_components,
animation_data_);
}
diff --git a/contrib/draco/src/draco/animation/node_animation_data.h b/contrib/draco/src/draco/animation/node_animation_data.h
new file mode 100644
index 000000000..7799e3376
--- /dev/null
+++ b/contrib/draco/src/draco/animation/node_animation_data.h
@@ -0,0 +1,150 @@
+// Copyright 2019 The Draco Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#ifndef DRACO_ANIMATION_NODE_ANIMATION_DATA_H_
+#define DRACO_ANIMATION_NODE_ANIMATION_DATA_H_
+
+#include "draco/draco_features.h"
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+#include "draco/core/hash_utils.h"
+#include "draco/core/status.h"
+#include "draco/core/status_or.h"
+
+namespace draco {
+
+// This class is used to store information and data for animations that only
+// affect the nodes.
+// TODO(fgalligan): Think about changing the name of this class now that Skin
+// is using it.
+class NodeAnimationData {
+ public:
+ enum class Type { SCALAR, VEC3, VEC4, MAT4 };
+
+ NodeAnimationData() : type_(Type::SCALAR), count_(0), normalized_(false) {}
+
+ void Copy(const NodeAnimationData &src) {
+ type_ = src.type_;
+ count_ = src.count_;
+ normalized_ = src.normalized_;
+ data_ = src.data_;
+ }
+
+ Type type() const { return type_; }
+ int count() const { return count_; }
+ bool normalized() const { return normalized_; }
+
+ std::vector *GetMutableData() { return &data_; }
+ const std::vector *GetData() const { return &data_; }
+
+ void SetType(Type type) { type_ = type; }
+ void SetCount(int count) { count_ = count; }
+ void SetNormalized(bool normalized) { normalized_ = normalized; }
+
+ int ComponentSize() const { return sizeof(float); }
+ int NumComponents() const {
+ switch (type_) {
+ case Type::SCALAR:
+ return 1;
+ case Type::VEC3:
+ return 3;
+ case Type::MAT4:
+ return 16;
+ default:
+ return 4;
+ }
+ }
+
+ std::string TypeAsString() const {
+ switch (type_) {
+ case Type::SCALAR:
+ return "SCALAR";
+ case Type::VEC3:
+ return "VEC3";
+ case Type::MAT4:
+ return "MAT4";
+ default:
+ return "VEC4";
+ }
+ }
+
+ bool operator==(const NodeAnimationData &nad) const {
+ return type_ == nad.type_ && count_ == nad.count_ &&
+ normalized_ == nad.normalized_ && data_ == nad.data_;
+ }
+
+ private:
+ Type type_;
+ int count_;
+ bool normalized_;
+ std::vector data_;
+};
+
+// Wrapper class for hashing NodeAnimationData. When using different containers,
+// this class is preferable instead of copying the data in NodeAnimationData
+// every time.
+class NodeAnimationDataHash {
+ public:
+ NodeAnimationDataHash() = delete;
+ NodeAnimationDataHash &operator=(const NodeAnimationDataHash &) = delete;
+ NodeAnimationDataHash(NodeAnimationDataHash &&) = delete;
+ NodeAnimationDataHash &operator=(NodeAnimationDataHash &&) = delete;
+
+ explicit NodeAnimationDataHash(const NodeAnimationData *nad)
+ : node_animation_data_(nad) {
+ hash_ = NodeAnimationDataHash::HashNodeAnimationData(*node_animation_data_);
+ }
+
+ NodeAnimationDataHash(const NodeAnimationDataHash &nadh) {
+ node_animation_data_ = nadh.node_animation_data_;
+ hash_ = nadh.hash_;
+ }
+
+ bool operator==(const NodeAnimationDataHash &nadh) const {
+ return *node_animation_data_ == *nadh.node_animation_data_;
+ }
+
+ struct Hash {
+ size_t operator()(const NodeAnimationDataHash &nadh) const {
+ return nadh.hash_;
+ }
+ };
+
+ const NodeAnimationData *GetNodeAnimationData() {
+ return node_animation_data_;
+ }
+
+ private:
+ // Returns a hash of |nad|.
+ static size_t HashNodeAnimationData(const NodeAnimationData &nad) {
+ size_t hash = 79; // Magic number.
+ hash = HashCombine(static_cast(nad.type()), hash);
+ hash = HashCombine(nad.count(), hash);
+ hash = HashCombine(nad.normalized(), hash);
+ const uint64_t data_hash =
+ FingerprintString(reinterpret_cast(nad.GetData()->data()),
+ nad.GetData()->size() * sizeof(float));
+ hash = HashCombine(data_hash, hash);
+ return hash;
+ }
+
+ const NodeAnimationData *node_animation_data_;
+ size_t hash_;
+};
+
+} // namespace draco
+
+#endif // DRACO_TRANSCODER_SUPPORTED
+#endif // DRACO_ANIMATION_NODE_ANIMATION_DATA_H_
diff --git a/contrib/draco/src/draco/animation/skin.cc b/contrib/draco/src/draco/animation/skin.cc
new file mode 100644
index 000000000..f232978c2
--- /dev/null
+++ b/contrib/draco/src/draco/animation/skin.cc
@@ -0,0 +1,29 @@
+// Copyright 2019 The Draco Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#include "draco/animation/skin.h"
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+namespace draco {
+
+void Skin::Copy(const Skin &s) {
+ inverse_bind_matrices_.Copy(s.GetInverseBindMatrices());
+ joints_ = s.GetJoints();
+ joint_root_index_ = s.GetJointRoot();
+}
+
+} // namespace draco
+
+#endif // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/animation/skin.h b/contrib/draco/src/draco/animation/skin.h
new file mode 100644
index 000000000..81ca997eb
--- /dev/null
+++ b/contrib/draco/src/draco/animation/skin.h
@@ -0,0 +1,64 @@
+// Copyright 2019 The Draco Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#ifndef DRACO_ANIMATION_SKIN_H_
+#define DRACO_ANIMATION_SKIN_H_
+
+#include "draco/draco_features.h"
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+#include
+
+#include "draco/animation/node_animation_data.h"
+#include "draco/scene/scene_indices.h"
+
+namespace draco {
+
+// This class is used to store information on animation skins.
+class Skin {
+ public:
+ Skin() : joint_root_index_(-1) {}
+
+ void Copy(const Skin &s);
+
+ NodeAnimationData &GetInverseBindMatrices() { return inverse_bind_matrices_; }
+ const NodeAnimationData &GetInverseBindMatrices() const {
+ return inverse_bind_matrices_;
+ }
+
+ int AddJoint(SceneNodeIndex index) {
+ joints_.push_back(index);
+ return joints_.size() - 1;
+ }
+ int NumJoints() const { return joints_.size(); }
+ SceneNodeIndex GetJoint(int index) const { return joints_[index]; }
+ SceneNodeIndex &GetJoint(int index) { return joints_[index]; }
+ const std::vector &GetJoints() const { return joints_; }
+
+ void SetJointRoot(SceneNodeIndex index) { joint_root_index_ = index; }
+ SceneNodeIndex GetJointRoot() const { return joint_root_index_; }
+
+ private:
+ NodeAnimationData inverse_bind_matrices_;
+
+ // List of node indices that make up the joint hierarchy.
+ std::vector joints_;
+ SceneNodeIndex joint_root_index_;
+};
+
+} // namespace draco
+
+#endif // DRACO_TRANSCODER_SUPPORTED
+#endif // DRACO_ANIMATION_SKIN_H_
diff --git a/contrib/draco/src/draco/attributes/attribute_transform.cc b/contrib/draco/src/draco/attributes/attribute_transform.cc
index 174e6b822..fb2ed1829 100644
--- a/contrib/draco/src/draco/attributes/attribute_transform.cc
+++ b/contrib/draco/src/draco/attributes/attribute_transform.cc
@@ -28,12 +28,13 @@ std::unique_ptr AttributeTransform::InitTransformedAttribute(
const PointAttribute &src_attribute, int num_entries) {
const int num_components = GetTransformedNumComponents(src_attribute);
const DataType dt = GetTransformedDataType(src_attribute);
- GeometryAttribute va;
- va.Init(src_attribute.attribute_type(), nullptr, num_components, dt, false,
+ GeometryAttribute ga;
+ ga.Init(src_attribute.attribute_type(), nullptr, num_components, dt, false,
num_components * DataTypeLength(dt), 0);
- std::unique_ptr transformed_attribute(new PointAttribute(va));
+ std::unique_ptr transformed_attribute(new PointAttribute(ga));
transformed_attribute->Reset(num_entries);
transformed_attribute->SetIdentityMapping();
+ transformed_attribute->set_unique_id(src_attribute.unique_id());
return transformed_attribute;
}
diff --git a/contrib/draco/src/draco/attributes/geometry_attribute.cc b/contrib/draco/src/draco/attributes/geometry_attribute.cc
index b62478426..141130f43 100644
--- a/contrib/draco/src/draco/attributes/geometry_attribute.cc
+++ b/contrib/draco/src/draco/attributes/geometry_attribute.cc
@@ -26,7 +26,7 @@ GeometryAttribute::GeometryAttribute()
unique_id_(0) {}
void GeometryAttribute::Init(GeometryAttribute::Type attribute_type,
- DataBuffer *buffer, int8_t num_components,
+ DataBuffer *buffer, uint8_t num_components,
DataType data_type, bool normalized,
int64_t byte_stride, int64_t byte_offset) {
buffer_ = buffer;
diff --git a/contrib/draco/src/draco/attributes/geometry_attribute.h b/contrib/draco/src/draco/attributes/geometry_attribute.h
index f4d099b1b..28f743fa0 100644
--- a/contrib/draco/src/draco/attributes/geometry_attribute.h
+++ b/contrib/draco/src/draco/attributes/geometry_attribute.h
@@ -15,12 +15,18 @@
#ifndef DRACO_ATTRIBUTES_GEOMETRY_ATTRIBUTE_H_
#define DRACO_ATTRIBUTES_GEOMETRY_ATTRIBUTE_H_
+#include
#include
+#include
#include
#include "draco/attributes/geometry_indices.h"
#include "draco/core/data_buffer.h"
#include "draco/core/hash_utils.h"
+#include "draco/draco_features.h"
+#ifdef DRACO_TRANSCODER_SUPPORTED
+#include "draco/core/status.h"
+#endif
namespace draco {
@@ -51,6 +57,16 @@ class GeometryAttribute {
// predefined use case. Such attributes are often used for a shader specific
// data.
GENERIC,
+#ifdef DRACO_TRANSCODER_SUPPORTED
+ // TODO(ostava): Adding a new attribute would be bit-stream change for GLTF.
+ // Older decoders wouldn't know what to do with this attribute type. This
+ // should be open-sourced only when we are ready to increase our bit-stream
+ // version.
+ TANGENT,
+ MATERIAL,
+ JOINTS,
+ WEIGHTS,
+#endif
// Total number of different attribute types.
// Always keep behind all named attributes.
NAMED_ATTRIBUTES_COUNT,
@@ -58,7 +74,7 @@ class GeometryAttribute {
GeometryAttribute();
// Initializes and enables the attribute.
- void Init(Type attribute_type, DataBuffer *buffer, int8_t num_components,
+ void Init(Type attribute_type, DataBuffer *buffer, uint8_t num_components,
DataType data_type, bool normalized, int64_t byte_stride,
int64_t byte_offset);
bool IsValid() const { return buffer_ != nullptr; }
@@ -129,6 +145,17 @@ class GeometryAttribute {
buffer_->Write(byte_pos, value, byte_stride());
}
+#ifdef DRACO_TRANSCODER_SUPPORTED
+ // Sets a value of an attribute entry. The input |value| must have
+ // |input_num_components| entries and it will be automatically converted to
+ // the internal format used by the geometry attribute. If the conversion is
+ // not possible, an error status will be returned.
+ template
+ Status ConvertAndSetAttributeValue(AttributeValueIndex avi,
+ int input_num_components,
+ const InputT *value);
+#endif
+
// DEPRECATED: Use
// ConvertValue(AttributeValueIndex att_id,
// int out_num_components,
@@ -233,10 +260,11 @@ class GeometryAttribute {
// Returns the number of components that are stored for each entry.
// For position attribute this is usually three (x,y,z),
// while texture coordinates have two components (u,v).
- int8_t num_components() const { return num_components_; }
+ uint8_t num_components() const { return num_components_; }
// Indicates whether the data type should be normalized before interpretation,
// that is, it should be divided by the max value of the data type.
bool normalized() const { return normalized_; }
+ void set_normalized(bool normalized) { normalized_ = normalized; }
// The buffer storing the entire data of the attribute.
const DataBuffer *buffer() const { return buffer_; }
// Returns the number of bytes between two attribute entries, this is, at
@@ -260,7 +288,7 @@ class GeometryAttribute {
// T is the stored attribute data type.
// OutT is the desired data type of the attribute.
template
- bool ConvertTypedValue(AttributeValueIndex att_id, int8_t out_num_components,
+ bool ConvertTypedValue(AttributeValueIndex att_id, uint8_t out_num_components,
OutT *out_value) const {
const uint8_t *src_address = GetAddress(att_id);
@@ -270,29 +298,10 @@ class GeometryAttribute {
return false;
}
const T in_value = *reinterpret_cast(src_address);
-
- // Make sure the in_value fits within the range of values that OutT
- // is able to represent. Perform the check only for integral types.
- if (std::is_integral::value && std::is_integral::value) {
- static constexpr OutT kOutMin =
- std::is_signed::value ? std::numeric_limits::lowest() : 0;
- if (in_value < kOutMin || in_value > std::numeric_limits::max()) {
- return false;
- }
+ if (!ConvertComponentValue(in_value, normalized_,
+ out_value + i)) {
+ return false;
}
-
- out_value[i] = static_cast(in_value);
- // When converting integer to floating point, normalize the value if
- // necessary.
- if (std::is_integral::value && std::is_floating_point::value &&
- normalized_) {
- out_value[i] /= static_cast(std::numeric_limits::max());
- }
- // TODO(ostava): Add handling of normalized attributes when converting
- // between different integer representations. If the attribute is
- // normalized, integer values should be converted as if they represent 0-1
- // range. E.g. when we convert uint16 to uint8, the range <0, 2^16 - 1>
- // should be converted to range <0, 2^8 - 1>.
src_address += sizeof(T);
}
// Fill empty data for unused output components if needed.
@@ -302,12 +311,128 @@ class GeometryAttribute {
return true;
}
+#ifdef DRACO_TRANSCODER_SUPPORTED
+ // Function that converts input |value| from type T to the internal attribute
+ // representation defined by OutT and |num_components_|.
+ template
+ Status ConvertAndSetAttributeTypedValue(AttributeValueIndex avi,
+ int8_t input_num_components,
+ const T *value) {
+ uint8_t *address = GetAddress(avi);
+
+ // Convert all components available in both the original and output formats.
+ for (int i = 0; i < num_components_; ++i) {
+ if (!IsAddressValid(address)) {
+ return ErrorStatus("GeometryAttribute: Invalid address.");
+ }
+ OutT *const out_value = reinterpret_cast(address);
+ if (i < input_num_components) {
+ if (!ConvertComponentValue(*(value + i), normalized_,
+ out_value)) {
+ return ErrorStatus(
+ "GeometryAttribute: Failed to convert component value.");
+ }
+ } else {
+ *out_value = static_cast(0);
+ }
+ address += sizeof(OutT);
+ }
+ return OkStatus();
+ }
+#endif // DRACO_TRANSCODER_SUPPORTED
+
+ // Converts |in_value| of type T into |out_value| of type OutT. If
+ // |normalized| is true, any conversion between floating point and integer
+ // values will be treating integers as normalized types (the entire integer
+ // range will be used to represent 0-1 floating point range).
+ template
+ static bool ConvertComponentValue(const T &in_value, bool normalized,
+ OutT *out_value) {
+ // Make sure the |in_value| can be represented as an integral type OutT.
+ if (std::is_integral::value) {
+ // Make sure the |in_value| fits within the range of values that OutT
+ // is able to represent. Perform the check only for integral types.
+ if (!std::is_same::value && std::is_integral::value) {
+ static constexpr OutT kOutMin =
+ std::is_signed::value ? std::numeric_limits::min() : 0;
+ if (in_value < kOutMin || in_value > std::numeric_limits::max()) {
+ return false;
+ }
+ }
+
+ // Check conversion of floating point |in_value| to integral value OutT.
+ if (std::is_floating_point::value) {
+ // Make sure the floating point |in_value| is not NaN and not Inf as
+ // integral type OutT is unable to represent these values.
+ if (sizeof(in_value) > sizeof(double)) {
+ if (std::isnan(static_cast(in_value)) ||
+ std::isinf(static_cast(in_value))) {
+ return false;
+ }
+ } else if (sizeof(in_value) > sizeof(float)) {
+ if (std::isnan(static_cast(in_value)) ||
+ std::isinf(static_cast(in_value))) {
+ return false;
+ }
+ } else {
+ if (std::isnan(static_cast(in_value)) ||
+ std::isinf(static_cast(in_value))) {
+ return false;
+ }
+ }
+
+ // Make sure the floating point |in_value| fits within the range of
+ // values that integral type OutT is able to represent.
+ if (in_value < std::numeric_limits::min() ||
+ in_value >= std::numeric_limits::max()) {
+ return false;
+ }
+ }
+ }
+
+ if (std::is_integral::value && std::is_floating_point::value &&
+ normalized) {
+ // When converting integer to floating point, normalize the value if
+ // necessary.
+ *out_value = static_cast(in_value);
+ *out_value /= static_cast(std::numeric_limits::max());
+ } else if (std::is_floating_point::value &&
+ std::is_integral::value && normalized) {
+ // Converting from floating point to a normalized integer.
+ if (in_value > 1 || in_value < 0) {
+ // Normalized float values need to be between 0 and 1.
+ return false;
+ }
+ // TODO(ostava): Consider allowing float to normalized integer conversion
+ // for 64-bit integer types. Currently it doesn't work because we don't
+ // have a floating point type that could store all 64 bit integers.
+ if (sizeof(OutT) > 4) {
+ return false;
+ }
+ // Expand the float to the range of the output integer and round it to the
+ // nearest representable value. Use doubles for the math to ensure the
+ // integer values are represented properly during the conversion process.
+ *out_value = static_cast(std::floor(
+ in_value * static_cast(std::numeric_limits::max()) +
+ 0.5));
+ } else {
+ *out_value = static_cast(in_value);
+ }
+
+ // TODO(ostava): Add handling of normalized attributes when converting
+ // between different integer representations. If the attribute is
+ // normalized, integer values should be converted as if they represent 0-1
+ // range. E.g. when we convert uint16 to uint8, the range <0, 2^16 - 1>
+ // should be converted to range <0, 2^8 - 1>.
+ return true;
+ }
+
DataBuffer *buffer_;
// The buffer descriptor is stored at the time the buffer is attached to this
// attribute. The purpose is to detect if any changes happened to the buffer
// since the time it was attached.
DataBufferDescriptor buffer_descriptor_;
- int8_t num_components_;
+ uint8_t num_components_;
DataType data_type_;
bool normalized_;
int64_t byte_stride_;
@@ -323,6 +448,54 @@ class GeometryAttribute {
friend struct GeometryAttributeHasher;
};
+#ifdef DRACO_TRANSCODER_SUPPORTED
+template
+Status GeometryAttribute::ConvertAndSetAttributeValue(AttributeValueIndex avi,
+ int input_num_components,
+ const InputT *value) {
+ switch (this->data_type()) {
+ case DT_INT8:
+ return ConvertAndSetAttributeTypedValue(
+ avi, input_num_components, value);
+ case DT_UINT8:
+ return ConvertAndSetAttributeTypedValue(
+ avi, input_num_components, value);
+ case DT_INT16:
+ return ConvertAndSetAttributeTypedValue(
+ avi, input_num_components, value);
+ case DT_UINT16:
+ return ConvertAndSetAttributeTypedValue(
+ avi, input_num_components, value);
+ case DT_INT32:
+ return ConvertAndSetAttributeTypedValue(
+ avi, input_num_components, value);
+ case DT_UINT32:
+ return ConvertAndSetAttributeTypedValue(
+ avi, input_num_components, value);
+ case DT_INT64:
+ return ConvertAndSetAttributeTypedValue(
+ avi, input_num_components, value);
+ case DT_UINT64:
+ return ConvertAndSetAttributeTypedValue(
+ avi, input_num_components, value);
+ case DT_FLOAT32:
+ return ConvertAndSetAttributeTypedValue(
+ avi, input_num_components, value);
+ case DT_FLOAT64:
+ return ConvertAndSetAttributeTypedValue(
+ avi, input_num_components, value);
+ case DT_BOOL:
+ return ConvertAndSetAttributeTypedValue(
+ avi, input_num_components, value);
+ default:
+ break;
+ }
+ return ErrorStatus(
+ "GeometryAttribute::SetAndConvertAttributeValue: Unsupported "
+ "attribute type.");
+}
+#endif
+
// Hashing support
// Function object for using Attribute as a hash key.
diff --git a/contrib/draco/src/draco/attributes/point_attribute.cc b/contrib/draco/src/draco/attributes/point_attribute.cc
index b28f860c1..e54ab5427 100644
--- a/contrib/draco/src/draco/attributes/point_attribute.cc
+++ b/contrib/draco/src/draco/attributes/point_attribute.cc
@@ -222,4 +222,47 @@ AttributeValueIndex::ValueType PointAttribute::DeduplicateFormattedValues(
}
#endif
+#ifdef DRACO_TRANSCODER_SUPPORTED
+void PointAttribute::RemoveUnusedValues() {
+ if (is_mapping_identity()) {
+ return; // For identity mapping, all values are always used.
+ }
+ // For explicit mapping we need to check if any point is mapped to a value.
+ // If not we can delete the value.
+ IndexTypeVector is_value_used(size(), false);
+ int num_used_values = 0;
+ for (PointIndex pi(0); pi < indices_map_.size(); ++pi) {
+ const AttributeValueIndex avi = indices_map_[pi];
+ if (!is_value_used[avi]) {
+ is_value_used[avi] = true;
+ num_used_values++;
+ }
+ }
+ if (num_used_values == size()) {
+ return; // All values are used.
+ }
+
+ // Remap the values and update the point to value mapping.
+ IndexTypeVector
+ old_to_new_value_map(size(), kInvalidAttributeValueIndex);
+ AttributeValueIndex new_avi(0);
+ for (AttributeValueIndex avi(0); avi < size(); ++avi) {
+ if (!is_value_used[avi]) {
+ continue;
+ }
+ if (avi != new_avi) {
+ SetAttributeValue(new_avi, GetAddress(avi));
+ }
+ old_to_new_value_map[avi] = new_avi++;
+ }
+
+ // Remap all points to the new attribute values.
+ for (PointIndex pi(0); pi < indices_map_.size(); ++pi) {
+ indices_map_[pi] = old_to_new_value_map[indices_map_[pi]];
+ }
+
+ num_unique_entries_ = num_used_values;
+}
+#endif
+
} // namespace draco
diff --git a/contrib/draco/src/draco/attributes/point_attribute.h b/contrib/draco/src/draco/attributes/point_attribute.h
index ee3662031..d55c50c8a 100644
--- a/contrib/draco/src/draco/attributes/point_attribute.h
+++ b/contrib/draco/src/draco/attributes/point_attribute.h
@@ -133,6 +133,12 @@ class PointAttribute : public GeometryAttribute {
return attribute_transform_data_.get();
}
+#ifdef DRACO_TRANSCODER_SUPPORTED
+ // Removes unused values from the attribute. Value is unused when no point
+ // is mapped to the value. Only applicable when the mapping is not identity.
+ void RemoveUnusedValues();
+#endif
+
private:
#ifdef DRACO_ATTRIBUTE_VALUES_DEDUPLICATION_SUPPORTED
template
diff --git a/contrib/draco/src/draco/compression/attributes/attributes_encoder.cc b/contrib/draco/src/draco/compression/attributes/attributes_encoder.cc
index 797c62f30..480e3ff34 100644
--- a/contrib/draco/src/draco/compression/attributes/attributes_encoder.cc
+++ b/contrib/draco/src/draco/compression/attributes/attributes_encoder.cc
@@ -15,14 +15,16 @@
#include "draco/compression/attributes/attributes_encoder.h"
#include "draco/core/varint_encoding.h"
+#include "draco/draco_features.h"
namespace draco {
AttributesEncoder::AttributesEncoder()
: point_cloud_encoder_(nullptr), point_cloud_(nullptr) {}
-AttributesEncoder::AttributesEncoder(int att_id) : AttributesEncoder() {
- AddAttributeId(att_id);
+AttributesEncoder::AttributesEncoder(int point_attrib_id)
+ : AttributesEncoder() {
+ AddAttributeId(point_attrib_id);
}
bool AttributesEncoder::Init(PointCloudEncoder *encoder, const PointCloud *pc) {
@@ -37,7 +39,15 @@ bool AttributesEncoder::EncodeAttributesEncoderData(EncoderBuffer *out_buffer) {
for (uint32_t i = 0; i < num_attributes(); ++i) {
const int32_t att_id = point_attribute_ids_[i];
const PointAttribute *const pa = point_cloud_->attribute(att_id);
- out_buffer->Encode(static_cast(pa->attribute_type()));
+ GeometryAttribute::Type type = pa->attribute_type();
+#ifdef DRACO_TRANSCODER_SUPPORTED
+ // Attribute types TANGENT, MATERIAL, JOINTS, and WEIGHTS are not supported
+ // in the official bitstream. They will be encoded as GENERIC.
+ if (type > GeometryAttribute::GENERIC) {
+ type = GeometryAttribute::GENERIC;
+ }
+#endif
+ out_buffer->Encode(static_cast(type));
out_buffer->Encode(static_cast(pa->data_type()));
out_buffer->Encode(static_cast(pa->num_components()));
out_buffer->Encode(static_cast(pa->normalized()));
diff --git a/contrib/draco/src/draco/compression/attributes/kd_tree_attributes_decoder.cc b/contrib/draco/src/draco/compression/attributes/kd_tree_attributes_decoder.cc
index e4d53485d..51c41cf7a 100644
--- a/contrib/draco/src/draco/compression/attributes/kd_tree_attributes_decoder.cc
+++ b/contrib/draco/src/draco/compression/attributes/kd_tree_attributes_decoder.cc
@@ -72,16 +72,19 @@ class PointAttributeVectorOutputIterator {
Self &operator*() { return *this; }
// Still needed in some cases.
- // TODO(hemmer): remove.
+ // TODO(b/199760123): Remove.
// hardcoded to 3 based on legacy usage.
const Self &operator=(const VectorD &val) {
DRACO_DCHECK_EQ(attributes_.size(), 1); // Expect only ONE attribute.
AttributeTuple &att = attributes_[0];
PointAttribute *attribute = std::get<0>(att);
+ const AttributeValueIndex avi = attribute->mapped_index(point_id_);
+ if (avi >= static_cast(attribute->size())) {
+ return *this;
+ }
const uint32_t &offset = std::get<1>(att);
DRACO_DCHECK_EQ(offset, 0); // expected to be zero
- attribute->SetAttributeValue(attribute->mapped_index(point_id_),
- &val[0] + offset);
+ attribute->SetAttributeValue(avi, &val[0] + offset);
return *this;
}
// Additional operator taking std::vector as argument.
@@ -89,6 +92,10 @@ class PointAttributeVectorOutputIterator {
for (auto index = 0; index < attributes_.size(); index++) {
AttributeTuple &att = attributes_[index];
PointAttribute *attribute = std::get<0>(att);
+ const AttributeValueIndex avi = attribute->mapped_index(point_id_);
+ if (avi >= static_cast(attribute->size())) {
+ return *this;
+ }
const uint32_t &offset = std::get<1>(att);
const uint32_t &data_size = std::get<3>(att);
const uint32_t &num_components = std::get<4>(att);
@@ -103,10 +110,6 @@ class PointAttributeVectorOutputIterator {
// redirect to copied data
data_source = reinterpret_cast(data_);
}
- const AttributeValueIndex avi = attribute->mapped_index(point_id_);
- if (avi >= static_cast(attribute->size())) {
- return *this;
- }
attribute->SetAttributeValue(avi, data_source);
}
return *this;
@@ -195,54 +198,55 @@ bool KdTreeAttributesDecoder::DecodePortableAttributes(
data_size, num_components);
total_dimensionality += num_components;
}
- PointAttributeVectorOutputIterator out_it(atts);
+ typedef PointAttributeVectorOutputIterator OutIt;
+ OutIt out_it(atts);
switch (compression_level) {
case 0: {
- DynamicIntegerPointsKdTreeDecoder<0> decoder(total_dimensionality);
- if (!decoder.DecodePoints(in_buffer, out_it)) {
+ if (!DecodePoints<0, OutIt>(total_dimensionality, num_points, in_buffer,
+ &out_it)) {
return false;
}
break;
}
case 1: {
- DynamicIntegerPointsKdTreeDecoder<1> decoder(total_dimensionality);
- if (!decoder.DecodePoints(in_buffer, out_it)) {
+ if (!DecodePoints<1, OutIt>(total_dimensionality, num_points, in_buffer,
+ &out_it)) {
return false;
}
break;
}
case 2: {
- DynamicIntegerPointsKdTreeDecoder<2> decoder(total_dimensionality);
- if (!decoder.DecodePoints(in_buffer, out_it)) {
+ if (!DecodePoints<2, OutIt>(total_dimensionality, num_points, in_buffer,
+ &out_it)) {
return false;
}
break;
}
case 3: {
- DynamicIntegerPointsKdTreeDecoder<3> decoder(total_dimensionality);
- if (!decoder.DecodePoints(in_buffer, out_it)) {
+ if (!DecodePoints<3, OutIt>(total_dimensionality, num_points, in_buffer,
+ &out_it)) {
return false;
}
break;
}
case 4: {
- DynamicIntegerPointsKdTreeDecoder<4> decoder(total_dimensionality);
- if (!decoder.DecodePoints(in_buffer, out_it)) {
+ if (!DecodePoints<4, OutIt>(total_dimensionality, num_points, in_buffer,
+ &out_it)) {
return false;
}
break;
}
case 5: {
- DynamicIntegerPointsKdTreeDecoder<5> decoder(total_dimensionality);
- if (!decoder.DecodePoints(in_buffer, out_it)) {
+ if (!DecodePoints<5, OutIt>(total_dimensionality, num_points, in_buffer,
+ &out_it)) {
return false;
}
break;
}
case 6: {
- DynamicIntegerPointsKdTreeDecoder<6> decoder(total_dimensionality);
- if (!decoder.DecodePoints(in_buffer, out_it)) {
+ if (!DecodePoints<6, OutIt>(total_dimensionality, num_points, in_buffer,
+ &out_it)) {
return false;
}
break;
@@ -253,6 +257,19 @@ bool KdTreeAttributesDecoder::DecodePortableAttributes(
return true;
}
+template
+bool KdTreeAttributesDecoder::DecodePoints(int total_dimensionality,
+ int num_expected_points,
+ DecoderBuffer *in_buffer,
+ OutIteratorT *out_iterator) {
+ DynamicIntegerPointsKdTreeDecoder decoder(total_dimensionality);
+ if (!decoder.DecodePoints(in_buffer, *out_iterator, num_expected_points) ||
+ decoder.num_decoded_points() != num_expected_points) {
+ return false;
+ }
+ return true;
+}
+
bool KdTreeAttributesDecoder::DecodeDataNeededByPortableTransforms(
DecoderBuffer *in_buffer) {
if (in_buffer->bitstream_version() >= DRACO_BITSTREAM_VERSION(2, 3)) {
@@ -336,6 +353,10 @@ bool KdTreeAttributesDecoder::DecodeDataNeededByPortableTransforms(
return false;
}
if (method == KdTreeAttributesEncodingMethod::kKdTreeQuantizationEncoding) {
+ // This method only supports one attribute with exactly three components.
+ if (atts.size() != 1 || std::get<4>(atts[0]) != 3) {
+ return false;
+ }
uint8_t compression_level = 0;
if (!in_buffer->Decode(&compression_level)) {
return false;
@@ -376,7 +397,7 @@ bool KdTreeAttributesDecoder::DecodeDataNeededByPortableTransforms(
GetDecoder()->point_cloud()->attribute(att_id);
attr->Reset(num_points);
attr->SetIdentityMapping();
- };
+ }
PointAttributeVectorOutputIterator out_it(atts);
@@ -455,7 +476,11 @@ bool KdTreeAttributesDecoder::TransformAttributeBackToSignedType(
att->GetValue(avi, &unsigned_val[0]);
for (int c = 0; c < att->num_components(); ++c) {
// Up-cast |unsigned_val| to int32_t to ensure we don't overflow it for
- // smaller data types.
+ // smaller data types. But first check that the up-casting does not cause
+ // signed integer overflow.
+ if (unsigned_val[c] > std::numeric_limits::max()) {
+ return false;
+ }
signed_val[c] = static_cast(
static_cast(unsigned_val[c]) +
min_signed_values_[num_processed_signed_components + c]);
diff --git a/contrib/draco/src/draco/compression/attributes/kd_tree_attributes_decoder.h b/contrib/draco/src/draco/compression/attributes/kd_tree_attributes_decoder.h
index 87338d6b0..4af367a1a 100644
--- a/contrib/draco/src/draco/compression/attributes/kd_tree_attributes_decoder.h
+++ b/contrib/draco/src/draco/compression/attributes/kd_tree_attributes_decoder.h
@@ -31,6 +31,10 @@ class KdTreeAttributesDecoder : public AttributesDecoder {
bool TransformAttributesToOriginalFormat() override;
private:
+ template
+ bool DecodePoints(int total_dimensionality, int num_expected_points,
+ DecoderBuffer *in_buffer, OutIteratorT *out_iterator);
+
template
bool TransformAttributeBackToSignedType(PointAttribute *att,
int num_processed_signed_components);
diff --git a/contrib/draco/src/draco/compression/attributes/normal_compression_utils.h b/contrib/draco/src/draco/compression/attributes/normal_compression_utils.h
index 8a6f25b66..b717d0dbe 100644
--- a/contrib/draco/src/draco/compression/attributes/normal_compression_utils.h
+++ b/contrib/draco/src/draco/compression/attributes/normal_compression_utils.h
@@ -61,7 +61,7 @@ class OctahedronToolBox {
return false;
}
quantization_bits_ = q;
- max_quantized_value_ = (1 << quantization_bits_) - 1;
+ max_quantized_value_ = (1u << quantization_bits_) - 1;
max_value_ = max_quantized_value_ - 1;
dequantization_scale_ = 2.f / max_value_;
center_value_ = max_value_ / 2;
@@ -208,7 +208,9 @@ class OctahedronToolBox {
DRACO_DCHECK_LE(t, center_value_);
DRACO_DCHECK_GE(s, -center_value_);
DRACO_DCHECK_GE(t, -center_value_);
- return std::abs(s) + std::abs(t) <= center_value_;
+ const uint32_t st =
+ static_cast(std::abs(s)) + static_cast(std::abs(t));
+ return st <= center_value_;
}
void InvertDiamond(int32_t *s, int32_t *t) const {
@@ -230,19 +232,29 @@ class OctahedronToolBox {
sign_t = (*t > 0) ? 1 : -1;
}
- const int32_t corner_point_s = sign_s * center_value_;
- const int32_t corner_point_t = sign_t * center_value_;
- *s = 2 * *s - corner_point_s;
- *t = 2 * *t - corner_point_t;
+ // Perform the addition and subtraction using unsigned integers to avoid
+ // signed integer overflows for bad data. Note that the result will be
+ // unchanged for non-overflowing cases.
+ const uint32_t corner_point_s = sign_s * center_value_;
+ const uint32_t corner_point_t = sign_t * center_value_;
+ uint32_t us = *s;
+ uint32_t ut = *t;
+ us = us + us - corner_point_s;
+ ut = ut + ut - corner_point_t;
if (sign_s * sign_t >= 0) {
- int32_t temp = *s;
- *s = -*t;
- *t = -temp;
+ uint32_t temp = us;
+ us = -ut;
+ ut = -temp;
} else {
- std::swap(*s, *t);
+ std::swap(us, ut);
}
- *s = (*s + corner_point_s) / 2;
- *t = (*t + corner_point_t) / 2;
+ us = us + corner_point_s;
+ ut = ut + corner_point_t;
+
+ *s = us;
+ *t = ut;
+ *s /= 2;
+ *t /= 2;
}
void InvertDirection(int32_t *s, int32_t *t) const {
@@ -318,7 +330,7 @@ class OctahedronToolBox {
// Remaining coordinate can be computed by projecting the (y, z) values onto
// the surface of the octahedron.
- const float x = 1.f - abs(y) - abs(z);
+ const float x = 1.f - std::abs(y) - std::abs(z);
// |x| is essentially a signed distance from the diagonal edges of the
// diamond shown on the figure above. It is positive for all points in the
diff --git a/contrib/draco/src/draco/compression/attributes/point_d_vector.h b/contrib/draco/src/draco/compression/attributes/point_d_vector.h
index 3b115d500..6ceb454ae 100644
--- a/contrib/draco/src/draco/compression/attributes/point_d_vector.h
+++ b/contrib/draco/src/draco/compression/attributes/point_d_vector.h
@@ -16,7 +16,9 @@
#ifndef DRACO_COMPRESSION_ATTRIBUTES_POINT_D_VECTOR_H_
#define DRACO_COMPRESSION_ATTRIBUTES_POINT_D_VECTOR_H_
+#include
#include
+#include
#include
#include
@@ -99,11 +101,17 @@ class PointDVector {
data_(n_items * dimensionality),
data0_(data_.data()) {}
// random access iterator
- class PointDVectorIterator
- : public std::iterator {
+ class PointDVectorIterator {
friend class PointDVector;
public:
+ // Iterator traits expected by std libraries.
+ using iterator_category = std::random_access_iterator_tag;
+ using value_type = size_t;
+ using difference_type = size_t;
+ using pointer = PointDVector *;
+ using reference = PointDVector &;
+
// std::iter_swap is called inside of std::partition and needs this
// specialized support
PseudoPointD operator*() const {
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_decoder.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_decoder.h
index 36c124baa..17899d054 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_decoder.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_decoder.h
@@ -22,6 +22,7 @@
#include "draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_decoder.h"
#include "draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_parallelogram_shared.h"
#include "draco/compression/bit_coders/rans_bit_decoder.h"
+#include "draco/core/math_utils.h"
#include "draco/core/varint_decoding.h"
#include "draco/draco_features.h"
@@ -161,7 +162,8 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramDecoder<
if (!is_crease) {
++num_used_parallelograms;
for (int j = 0; j < num_components; ++j) {
- multi_pred_vals[j] += pred_vals[i][j];
+ multi_pred_vals[j] =
+ AddAsUnsigned(multi_pred_vals[j], pred_vals[i][j]);
}
}
}
@@ -210,6 +212,9 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramDecoder<
if (!DecodeVarint(&num_flags, buffer)) {
return false;
}
+ if (num_flags > this->mesh_data().corner_table()->num_corners()) {
+ return false;
+ }
if (num_flags > 0) {
is_crease_edge_[i].resize(num_flags);
RAnsBitDecoder decoder;
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_encoder.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_encoder.h
index 77df8ee24..736598b15 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_encoder.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_constrained_multi_parallelogram_encoder.h
@@ -392,7 +392,7 @@ bool MeshPredictionSchemeConstrainedMultiParallelogramEncoder<
RAnsBitEncoder encoder;
encoder.StartEncoding();
// Encode the crease edge flags in the reverse vertex order that is needed
- // be the decoder. Note that for the currently supported mode, each vertex
+ // by the decoder. Note that for the currently supported mode, each vertex
// has exactly |num_used_parallelograms| edges that need to be encoded.
for (int j = static_cast(is_crease_edge_[i].size()) -
num_used_parallelograms;
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_multi_parallelogram_decoder.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_multi_parallelogram_decoder.h
index fc82e0a8f..9825c7261 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_multi_parallelogram_decoder.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_multi_parallelogram_decoder.h
@@ -18,6 +18,7 @@
#include "draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_decoder.h"
#include "draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_parallelogram_shared.h"
+#include "draco/core/math_utils.h"
#include "draco/draco_features.h"
namespace draco {
@@ -89,7 +90,8 @@ bool MeshPredictionSchemeMultiParallelogramDecoder(data[data_offset + 1]));
}
- void ComputePredictedValue(CornerIndex corner_id, const DataTypeT *data,
+ bool ComputePredictedValue(CornerIndex corner_id, const DataTypeT *data,
int data_id);
private:
@@ -123,6 +123,10 @@ bool MeshPredictionSchemeTexCoordsDecoder::
ComputeOriginalValues(const CorrType *in_corr, DataTypeT *out_data,
int /* size */, int num_components,
const PointIndex *entry_to_point_id_map) {
+ if (num_components != 2) {
+ // Corrupt/malformed input. Two output components are req'd.
+ return false;
+ }
num_components_ = num_components;
entry_to_point_id_map_ = entry_to_point_id_map;
predicted_value_ =
@@ -133,7 +137,9 @@ bool MeshPredictionSchemeTexCoordsDecoder::
static_cast(this->mesh_data().data_to_corner_map()->size());
for (int p = 0; p < corner_map_size; ++p) {
const CornerIndex corner_id = this->mesh_data().data_to_corner_map()->at(p);
- ComputePredictedValue(corner_id, out_data, p);
+ if (!ComputePredictedValue(corner_id, out_data, p)) {
+ return false;
+ }
const int dst_offset = p * num_components;
this->transform().ComputeOriginalValue(
@@ -159,6 +165,11 @@ bool MeshPredictionSchemeTexCoordsDecoder::
if (num_orientations == 0) {
return false;
}
+ if (num_orientations > this->mesh_data().corner_table()->num_corners()) {
+ // We can't have more orientations than the maximum number of decoded
+ // values.
+ return false;
+ }
orientations_.resize(num_orientations);
bool last_orientation = true;
RAnsBitDecoder decoder;
@@ -177,7 +188,7 @@ bool MeshPredictionSchemeTexCoordsDecoder::
}
template
-void MeshPredictionSchemeTexCoordsDecoder::
+bool MeshPredictionSchemeTexCoordsDecoder::
ComputePredictedValue(CornerIndex corner_id, const DataTypeT *data,
int data_id) {
// Compute the predicted UV coordinate from the positions on all corners
@@ -206,9 +217,17 @@ void MeshPredictionSchemeTexCoordsDecoder::
const Vector2f p_uv = GetTexCoordForEntryId(prev_data_id, data);
if (p_uv == n_uv) {
// We cannot do a reliable prediction on degenerated UV triangles.
- predicted_value_[0] = static_cast(p_uv[0]);
- predicted_value_[1] = static_cast(p_uv[1]);
- return;
+ // Technically floats > INT_MAX are undefined, but compilers will
+ // convert those values to INT_MIN. We are being explicit here for asan.
+ for (const int i : {0, 1}) {
+ if (std::isnan(p_uv[i]) || static_cast(p_uv[i]) > INT_MAX ||
+ static_cast(p_uv[i]) < INT_MIN) {
+ predicted_value_[i] = INT_MIN;
+ } else {
+ predicted_value_[i] = static_cast(p_uv[i]);
+ }
+ }
+ return true;
}
// Get positions at all corners.
@@ -282,32 +301,40 @@ void MeshPredictionSchemeTexCoordsDecoder::
const float pnvs = pn_uv[1] * s + n_uv[1];
const float pnvt = pn_uv[1] * t;
Vector2f predicted_uv;
+ if (orientations_.empty()) {
+ return false;
+ }
// When decoding the data, we already know which orientation to use.
const bool orientation = orientations_.back();
orientations_.pop_back();
- if (orientation)
+ if (orientation) {
predicted_uv = Vector2f(pnus - pnvt, pnvs + pnut);
- else
+ } else {
predicted_uv = Vector2f(pnus + pnvt, pnvs - pnut);
-
+ }
if (std::is_integral::value) {
// Round the predicted value for integer types.
- if (std::isnan(predicted_uv[0])) {
+ // Technically floats > INT_MAX are undefined, but compilers will
+ // convert those values to INT_MIN. We are being explicit here for asan.
+ const double u = floor(predicted_uv[0] + 0.5);
+ if (std::isnan(u) || u > INT_MAX || u < INT_MIN) {
predicted_value_[0] = INT_MIN;
} else {
- predicted_value_[0] = static_cast(floor(predicted_uv[0] + 0.5));
+ predicted_value_[0] = static_cast(u);
}
- if (std::isnan(predicted_uv[1])) {
+ const double v = floor(predicted_uv[1] + 0.5);
+ if (std::isnan(v) || v > INT_MAX || v < INT_MIN) {
predicted_value_[1] = INT_MIN;
} else {
- predicted_value_[1] = static_cast(floor(predicted_uv[1] + 0.5));
+ predicted_value_[1] = static_cast(v);
}
} else {
predicted_value_[0] = static_cast(predicted_uv[0]);
predicted_value_[1] = static_cast(predicted_uv[1]);
}
- return;
+
+ return true;
}
// Else we don't have available textures on both corners. For such case we
// can't use positions for predicting the uv value and we resort to delta
@@ -330,12 +357,13 @@ void MeshPredictionSchemeTexCoordsDecoder::
for (int i = 0; i < num_components_; ++i) {
predicted_value_[i] = 0;
}
- return;
+ return true;
}
}
for (int i = 0; i < num_components_; ++i) {
predicted_value_[i] = data[data_offset + i];
}
+ return true;
}
} // namespace draco
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_encoder.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_encoder.h
index 741ec66dc..44fcc7a6a 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_encoder.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_encoder.h
@@ -98,7 +98,10 @@ bool MeshPredictionSchemeTexCoordsPortableEncoder(this->mesh_data().data_to_corner_map()->size() - 1);
p >= 0; --p) {
const CornerIndex corner_id = this->mesh_data().data_to_corner_map()->at(p);
- predictor_.template ComputePredictedValue(corner_id, in_data, p);
+ if (!predictor_.template ComputePredictedValue(corner_id, in_data,
+ p)) {
+ return false;
+ }
const int dst_offset = p * num_components;
this->transform().ComputeCorrection(in_data + dst_offset,
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_predictor.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_predictor.h
index f05e5ddd7..26262fb13 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_predictor.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/mesh_prediction_scheme_tex_coords_portable_predictor.h
@@ -17,6 +17,9 @@
#include
+#include
+#include
+
#include "draco/attributes/point_attribute.h"
#include "draco/core/math_utils.h"
#include "draco/core/vector_d.h"
@@ -105,10 +108,14 @@ bool MeshPredictionSchemeTexCoordsPortablePredictor<
next_data_id = mesh_data_.vertex_to_data_map()->at(next_vert_id);
prev_data_id = mesh_data_.vertex_to_data_map()->at(prev_vert_id);
+ typedef VectorD Vec2;
+ typedef VectorD Vec3;
+ typedef VectorD Vec2u;
+
if (prev_data_id < data_id && next_data_id < data_id) {
// Both other corners have available UV coordinates for prediction.
- const VectorD n_uv = GetTexCoordForEntryId(next_data_id, data);
- const VectorD p_uv = GetTexCoordForEntryId(prev_data_id, data);
+ const Vec2 n_uv = GetTexCoordForEntryId(next_data_id, data);
+ const Vec2 p_uv = GetTexCoordForEntryId(prev_data_id, data);
if (p_uv == n_uv) {
// We cannot do a reliable prediction on degenerated UV triangles.
predicted_value_[0] = p_uv[0];
@@ -117,9 +124,9 @@ bool MeshPredictionSchemeTexCoordsPortablePredictor<
}
// Get positions at all corners.
- const VectorD tip_pos = GetPositionForEntryId(data_id);
- const VectorD next_pos = GetPositionForEntryId(next_data_id);
- const VectorD prev_pos = GetPositionForEntryId(prev_data_id);
+ const Vec3 tip_pos = GetPositionForEntryId(data_id);
+ const Vec3 next_pos = GetPositionForEntryId(next_data_id);
+ const Vec3 prev_pos = GetPositionForEntryId(prev_data_id);
// We use the positions of the above triangle to predict the texture
// coordinate on the tip corner C.
// To convert the triangle into the UV coordinate system we first compute
@@ -135,17 +142,17 @@ bool MeshPredictionSchemeTexCoordsPortablePredictor<
// Where next_pos is point (N), prev_pos is point (P) and tip_pos is the
// position of predicted coordinate (C).
//
- const VectorD pn = prev_pos - next_pos;
+ const Vec3 pn = prev_pos - next_pos;
const uint64_t pn_norm2_squared = pn.SquaredNorm();
if (pn_norm2_squared != 0) {
// Compute the projection of C onto PN by computing dot product of CN with
// PN and normalizing it by length of PN. This gives us a factor |s| where
// |s = PN.Dot(CN) / PN.SquaredNorm2()|. This factor can be used to
// compute X in UV space |X_UV| as |X_UV = N_UV + s * PN_UV|.
- const VectorD cn = tip_pos - next_pos;
+ const Vec3 cn = tip_pos - next_pos;
const int64_t cn_dot_pn = pn.Dot(cn);
- const VectorD pn_uv = p_uv - n_uv;
+ const Vec2 pn_uv = p_uv - n_uv;
// Because we perform all computations with integers, we don't explicitly
// compute the normalized factor |s|, but rather we perform all operations
// over UV vectors in a non-normalized coordinate system scaled with a
@@ -153,19 +160,30 @@ bool MeshPredictionSchemeTexCoordsPortablePredictor<
//
// x_uv = X_UV * PN.Norm2Squared()
//
- const VectorD x_uv =
- n_uv * pn_norm2_squared + (cn_dot_pn * pn_uv);
-
+ const int64_t n_uv_absmax_element =
+ std::max(std::abs(n_uv[0]), std::abs(n_uv[1]));
+ if (n_uv_absmax_element >
+ std::numeric_limits::max() / pn_norm2_squared) {
+ // Return false if the below multiplication would overflow.
+ return false;
+ }
+ const int64_t pn_uv_absmax_element =
+ std::max(std::abs(pn_uv[0]), std::abs(pn_uv[1]));
+ if (cn_dot_pn >
+ std::numeric_limits::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::max() / pn_absmax_element) {
- // return false if squared length calculation would overflow.
+ // Return false if squared length calculation would overflow.
return false;
}
// Compute squared length of vector CX in position coordinate system:
- const VectorD x_pos =
- next_pos + (cn_dot_pn * pn) / pn_norm2_squared;
+ const Vec3 x_pos = next_pos + (cn_dot_pn * pn) / pn_norm2_squared;
const uint64_t cx_norm2_squared = (tip_pos - x_pos).SquaredNorm();
// Compute vector CX_UV in the uv space by rotating vector PN_UV by 90
@@ -182,7 +200,7 @@ bool MeshPredictionSchemeTexCoordsPortablePredictor<
//
// cx_uv = CX.Norm2() * PN.Norm2() * Rot(PN_UV)
//
- VectorD cx_uv(pn_uv[1], -pn_uv[0]); // Rotated PN_UV.
+ Vec2 cx_uv(pn_uv[1], -pn_uv[0]); // Rotated PN_UV.
// Compute CX.Norm2() * PN.Norm2()
const uint64_t norm_squared =
IntSqrt(cx_norm2_squared * pn_norm2_squared);
@@ -191,17 +209,15 @@ bool MeshPredictionSchemeTexCoordsPortablePredictor<
// Predicted uv coordinate is then computed by either adding or
// subtracting CX_UV to/from X_UV.
- VectorD predicted_uv;
+ Vec2 predicted_uv;
if (is_encoder_t) {
// When encoding, compute both possible vectors and determine which one
// results in a better prediction.
// Both vectors need to be transformed back from the scaled space to
// the real UV coordinate space.
- const VectorD predicted_uv_0((x_uv + cx_uv) /
- pn_norm2_squared);
- const VectorD predicted_uv_1((x_uv - cx_uv) /
- pn_norm2_squared);
- const VectorD c_uv = GetTexCoordForEntryId(data_id, data);
+ const Vec2 predicted_uv_0((x_uv + cx_uv) / pn_norm2_squared);
+ const Vec2 predicted_uv_1((x_uv - cx_uv) / pn_norm2_squared);
+ const Vec2 c_uv = GetTexCoordForEntryId(data_id, data);
if ((c_uv - predicted_uv_0).SquaredNorm() <
(c_uv - predicted_uv_1).SquaredNorm()) {
predicted_uv = predicted_uv_0;
@@ -217,10 +233,12 @@ bool MeshPredictionSchemeTexCoordsPortablePredictor<
}
const bool orientation = orientations_.back();
orientations_.pop_back();
+ // Perform operations in unsigned type to avoid signed integer overflow.
+ // Note that the result will be the same (for non-overflowing values).
if (orientation) {
- predicted_uv = (x_uv + cx_uv) / pn_norm2_squared;
+ predicted_uv = Vec2(Vec2u(x_uv) + Vec2u(cx_uv)) / pn_norm2_squared;
} else {
- predicted_uv = (x_uv - cx_uv) / pn_norm2_squared;
+ predicted_uv = Vec2(Vec2u(x_uv) - Vec2u(cx_uv)) / pn_norm2_squared;
}
}
predicted_value_[0] = static_cast(predicted_uv[0]);
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.cc b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.cc
index f410a6cd2..2338f2f76 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.cc
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.cc
@@ -18,22 +18,58 @@ namespace draco {
PredictionSchemeMethod SelectPredictionMethod(
int att_id, const PointCloudEncoder *encoder) {
- if (encoder->options()->GetSpeed() >= 10) {
+ return SelectPredictionMethod(att_id, *encoder->options(), encoder);
+}
+
+PredictionSchemeMethod SelectPredictionMethod(
+ int att_id, const EncoderOptions &options,
+ const PointCloudEncoder *encoder) {
+ if (options.GetSpeed() >= 10) {
// Selected fastest, though still doing some compression.
return PREDICTION_DIFFERENCE;
}
if (encoder->GetGeometryType() == TRIANGULAR_MESH) {
// Use speed setting to select the best encoding method.
+ const int att_quant =
+ options.GetAttributeInt(att_id, "quantization_bits", -1);
const PointAttribute *const att = encoder->point_cloud()->attribute(att_id);
- if (att->attribute_type() == GeometryAttribute::TEX_COORD) {
- if (encoder->options()->GetSpeed() < 4) {
+ if (att_quant != -1 &&
+ att->attribute_type() == GeometryAttribute::TEX_COORD &&
+ att->num_components() == 2) {
+ // Texture coordinate predictor needs a position attribute that is either
+ // integer or quantized. For numerical reasons, we require the position
+ // quantization to be at most 21 bits and the 2*position_quantization +
+ // uv_quantization < 64 (TODO(b/231259902)).
+ const PointAttribute *const pos_att =
+ encoder->point_cloud()->GetNamedAttribute(
+ GeometryAttribute::POSITION);
+ bool is_pos_att_valid = false;
+ if (pos_att) {
+ if (IsDataTypeIntegral(pos_att->data_type())) {
+ is_pos_att_valid = true;
+ } else {
+ // Check quantization of the position attribute.
+ const int pos_att_id = encoder->point_cloud()->GetNamedAttributeId(
+ GeometryAttribute::POSITION);
+ const int pos_quant =
+ options.GetAttributeInt(pos_att_id, "quantization_bits", -1);
+ // Must be quantized but the quantization is restricted to 21 bits and
+ // 2*|pos_quant|+|att_quant| must be smaller than 64 bits.
+ if (pos_quant > 0 && pos_quant <= 21 &&
+ 2 * pos_quant + att_quant < 64) {
+ is_pos_att_valid = true;
+ }
+ }
+ }
+
+ if (is_pos_att_valid && options.GetSpeed() < 4) {
// Use texture coordinate prediction for speeds 0, 1, 2, 3.
return MESH_PREDICTION_TEX_COORDS_PORTABLE;
}
}
if (att->attribute_type() == GeometryAttribute::NORMAL) {
#ifdef DRACO_NORMAL_ENCODING_SUPPORTED
- if (encoder->options()->GetSpeed() < 4) {
+ if (options.GetSpeed() < 4) {
// Use geometric normal prediction for speeds 0, 1, 2, 3.
// For this prediction, the position attribute needs to be either
// integer or quantized as well.
@@ -43,8 +79,8 @@ PredictionSchemeMethod SelectPredictionMethod(
encoder->point_cloud()->GetNamedAttribute(
GeometryAttribute::POSITION);
if (pos_att && (IsDataTypeIntegral(pos_att->data_type()) ||
- encoder->options()->GetAttributeInt(
- pos_att_id, "quantization_bits", -1) > 0)) {
+ options.GetAttributeInt(pos_att_id, "quantization_bits",
+ -1) > 0)) {
return MESH_PREDICTION_GEOMETRIC_NORMAL;
}
}
@@ -52,11 +88,10 @@ PredictionSchemeMethod SelectPredictionMethod(
return PREDICTION_DIFFERENCE; // default
}
// Handle other attribute types.
- if (encoder->options()->GetSpeed() >= 8) {
+ if (options.GetSpeed() >= 8) {
return PREDICTION_DIFFERENCE;
}
- if (encoder->options()->GetSpeed() >= 2 ||
- encoder->point_cloud()->num_points() < 40) {
+ if (options.GetSpeed() >= 2 || encoder->point_cloud()->num_points() < 40) {
// Parallelogram prediction is used for speeds 2 - 7 or when the overhead
// of using constrained multi-parallelogram would be too high.
return MESH_PREDICTION_PARALLELOGRAM;
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.h
index 40a7683aa..11db5a62e 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_encoder_factory.h
@@ -38,6 +38,10 @@ namespace draco {
PredictionSchemeMethod SelectPredictionMethod(int att_id,
const PointCloudEncoder *encoder);
+PredictionSchemeMethod SelectPredictionMethod(int att_id,
+ const EncoderOptions &options,
+ const PointCloudEncoder *encoder);
+
// Factory class for creating mesh prediction schemes.
template
struct MeshPredictionSchemeEncoderFactory {
@@ -97,10 +101,11 @@ CreatePredictionSchemeForEncoder(PredictionSchemeMethod method, int att_id,
// template nature of the prediction schemes).
const MeshEncoder *const mesh_encoder =
static_cast(encoder);
+ const uint16_t bitstream_version = kDracoMeshBitstreamVersion;
auto ret = CreateMeshPredictionScheme<
MeshEncoder, PredictionSchemeEncoder,
MeshPredictionSchemeEncoderFactory>(
- mesh_encoder, method, att_id, transform, kDracoMeshBitstreamVersion);
+ mesh_encoder, method, att_id, transform, bitstream_version);
if (ret) {
return ret;
}
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_decoding_transform.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_decoding_transform.h
index 5a6c7c2dd..e9e345343 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_decoding_transform.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_decoding_transform.h
@@ -21,6 +21,7 @@
#include "draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_transform_base.h"
#include "draco/core/decoder_buffer.h"
#include "draco/core/macros.h"
+#include "draco/core/math_utils.h"
#include "draco/core/vector_d.h"
namespace draco {
@@ -98,9 +99,8 @@ class PredictionSchemeNormalOctahedronCanonicalizedDecodingTransform
if (!pred_is_in_bottom_left) {
pred = this->RotatePoint(pred, rotation_count);
}
- Point2 orig = pred + corr;
- orig[0] = this->ModMax(orig[0]);
- orig[1] = this->ModMax(orig[1]);
+ Point2 orig(this->ModMax(AddAsUnsigned(pred[0], corr[0])),
+ this->ModMax(AddAsUnsigned(pred[1], corr[1])));
if (!pred_is_in_bottom_left) {
const int32_t reverse_rotation_count = (4 - rotation_count) % 4;
orig = this->RotatePoint(orig, reverse_rotation_count);
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_transform_test.cc b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_transform_test.cc
index 8c8932f77..298758d8c 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_transform_test.cc
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_canonicalized_transform_test.cc
@@ -25,10 +25,10 @@ class PredictionSchemeNormalOctahedronCanonicalizedTransformTest
Transform;
typedef Transform::Point2 Point2;
- void TestComputeCorrection(const Transform &transform, const int32_t &ox,
- const int32_t &oy, const int32_t &px,
- const int32_t &py, const int32_t &cx,
- const int32_t &cy) {
+ void TestComputeCorrection(const Transform &transform, const int32_t ox,
+ const int32_t oy, const int32_t px,
+ const int32_t py, const int32_t cx,
+ const int32_t cy) {
const int32_t o[2] = {ox + 7, oy + 7};
const int32_t p[2] = {px + 7, py + 7};
int32_t corr[2] = {500, 500};
@@ -38,7 +38,7 @@ class PredictionSchemeNormalOctahedronCanonicalizedTransformTest
}
void TestGetRotationCount(const Transform &transform, const Point2 &pred,
- const int32_t &rot_dir) {
+ const int32_t rot_dir) {
const int32_t rotation_count = transform.GetRotationCount(pred);
ASSERT_EQ(rot_dir, rotation_count);
}
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_decoding_transform.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_decoding_transform.h
index a1bc4a327..d3705c8ad 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_decoding_transform.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_decoding_transform.h
@@ -80,19 +80,31 @@ class PredictionSchemeNormalOctahedronDecodingTransform
private:
Point2 ComputeOriginalValue(Point2 pred, const Point2 &corr) const {
const Point2 t(this->center_value(), this->center_value());
- pred = pred - t;
+ typedef typename std::make_unsigned::type UnsignedDataTypeT;
+ typedef VectorD Point2u;
+
+ // Perform the addition in unsigned type to avoid signed integer overflow.
+ // Note that the result will be the same (for non-overflowing values).
+ pred = Point2(Point2u(pred) - Point2u(t));
const bool pred_is_in_diamond = this->IsInDiamond(pred[0], pred[1]);
if (!pred_is_in_diamond) {
this->InvertDiamond(&pred[0], &pred[1]);
}
- Point2 orig = pred + corr;
+
+ // Perform the addition in unsigned type to avoid signed integer overflow.
+ // Note that the result will be the same (for non-overflowing values).
+ Point2 orig(Point2u(pred) + Point2u(corr));
+
orig[0] = this->ModMax(orig[0]);
orig[1] = this->ModMax(orig[1]);
if (!pred_is_in_diamond) {
this->InvertDiamond(&orig[0], &orig[1]);
}
- orig = orig + t;
+
+ // Perform the addition in unsigned type to avoid signed integer overflow.
+ // Note that the result will be the same (for non-overflowing values).
+ orig = Point2(Point2u(orig) + Point2u(t));
return orig;
}
};
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_transform_test.cc b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_transform_test.cc
index 1001b19fa..1403973c4 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_transform_test.cc
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_normal_octahedron_transform_test.cc
@@ -23,10 +23,10 @@ class PredictionSchemeNormalOctahedronTransformTest : public ::testing::Test {
Transform;
typedef Transform::Point2 Point2;
- void TestComputeCorrection(const Transform &transform, const int32_t &ox,
- const int32_t &oy, const int32_t &px,
- const int32_t &py, const int32_t &cx,
- const int32_t &cy) {
+ void TestComputeCorrection(const Transform &transform, const int32_t ox,
+ const int32_t oy, const int32_t px,
+ const int32_t py, const int32_t cx,
+ const int32_t cy) {
const int32_t o[2] = {ox + 7, oy + 7};
const int32_t p[2] = {px + 7, py + 7};
int32_t corr[2] = {500, 500};
diff --git a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_wrap_transform_base.h b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_wrap_transform_base.h
index 26f61fbaf..bba3de09c 100644
--- a/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_wrap_transform_base.h
+++ b/contrib/draco/src/draco/compression/attributes/prediction_schemes/prediction_scheme_wrap_transform_base.h
@@ -70,10 +70,10 @@ class PredictionSchemeWrapTransformBase {
clamped_value_[i] = predicted_val[i];
}
}
- return &clamped_value_[0];
+ return clamped_value_.data();
}
- // TODO(hemmer): Consider refactoring to avoid this dummy.
+ // TODO(b/199760123): Consider refactoring to avoid this dummy.
int quantization_bits() const {
DRACO_DCHECK(false);
return -1;
diff --git a/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_decoder.cc b/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_decoder.cc
index 83f42125a..17f32fc16 100644
--- a/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_decoder.cc
+++ b/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_decoder.cc
@@ -148,8 +148,9 @@ bool SequentialIntegerAttributeDecoder::DecodeIntegerValues(
return false;
}
for (size_t i = 0; i < num_values; ++i) {
- if (!in_buffer->Decode(portable_attribute_data + i, num_bytes))
+ if (!in_buffer->Decode(portable_attribute_data + i, num_bytes)) {
return false;
+ }
}
}
}
@@ -228,12 +229,13 @@ void SequentialIntegerAttributeDecoder::StoreTypedValues(uint32_t num_values) {
void SequentialIntegerAttributeDecoder::PreparePortableAttribute(
int num_entries, int num_components) {
- GeometryAttribute va;
- va.Init(attribute()->attribute_type(), nullptr, num_components, DT_INT32,
+ GeometryAttribute ga;
+ ga.Init(attribute()->attribute_type(), nullptr, num_components, DT_INT32,
false, num_components * DataTypeLength(DT_INT32), 0);
- std::unique_ptr port_att(new PointAttribute(va));
+ std::unique_ptr port_att(new PointAttribute(ga));
port_att->SetIdentityMapping();
port_att->Reset(num_entries);
+ port_att->set_unique_id(attribute()->unique_id());
SetPortableAttribute(std::move(port_att));
}
diff --git a/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_encoder.cc b/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_encoder.cc
index e66a0a8a4..5f673be42 100644
--- a/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_encoder.cc
+++ b/contrib/draco/src/draco/compression/attributes/sequential_integer_attribute_encoder.cc
@@ -138,9 +138,11 @@ bool SequentialIntegerAttributeEncoder::EncodeValues(
// All integer values are initialized. Process them using the prediction
// scheme if we have one.
if (prediction_scheme_) {
- prediction_scheme_->ComputeCorrectionValues(
- portable_attribute_data, &encoded_data[0], num_values, num_components,
- point_ids.data());
+ if (!prediction_scheme_->ComputeCorrectionValues(
+ portable_attribute_data, &encoded_data[0], num_values,
+ num_components, point_ids.data())) {
+ return false;
+ }
}
if (prediction_scheme_ == nullptr ||
diff --git a/contrib/draco/src/draco/compression/attributes/sequential_normal_attribute_encoder.cc b/contrib/draco/src/draco/compression/attributes/sequential_normal_attribute_encoder.cc
index 2e20e89e6..3c5ef0ebc 100644
--- a/contrib/draco/src/draco/compression/attributes/sequential_normal_attribute_encoder.cc
+++ b/contrib/draco/src/draco/compression/attributes/sequential_normal_attribute_encoder.cc
@@ -20,8 +20,9 @@ namespace draco {
bool SequentialNormalAttributeEncoder::Init(PointCloudEncoder *encoder,
int attribute_id) {
- if (!SequentialIntegerAttributeEncoder::Init(encoder, attribute_id))
+ if (!SequentialIntegerAttributeEncoder::Init(encoder, attribute_id)) {
return false;
+ }
// Currently this encoder works only for 3-component normal vectors.
if (attribute()->num_components() != 3) {
return false;
diff --git a/contrib/draco/src/draco/compression/bit_coders/direct_bit_decoder.h b/contrib/draco/src/draco/compression/bit_coders/direct_bit_decoder.h
index b9fbc2d6f..6273692a2 100644
--- a/contrib/draco/src/draco/compression/bit_coders/direct_bit_decoder.h
+++ b/contrib/draco/src/draco/compression/bit_coders/direct_bit_decoder.h
@@ -47,14 +47,13 @@ class DirectBitDecoder {
// Decode the next |nbits| and return the sequence in |value|. |nbits| must be
// > 0 and <= 32.
- void DecodeLeastSignificantBits32(int nbits, uint32_t *value) {
+ bool DecodeLeastSignificantBits32(int nbits, uint32_t *value) {
DRACO_DCHECK_EQ(true, nbits <= 32);
DRACO_DCHECK_EQ(true, nbits > 0);
const int remaining = 32 - num_used_bits_;
if (nbits <= remaining) {
if (pos_ == bits_.end()) {
- *value = 0;
- return;
+ return false;
}
*value = (*pos_ << num_used_bits_) >> (32 - nbits);
num_used_bits_ += nbits;
@@ -64,8 +63,7 @@ class DirectBitDecoder {
}
} else {
if (pos_ + 1 == bits_.end()) {
- *value = 0;
- return;
+ return false;
}
const uint32_t value_l = ((*pos_) << num_used_bits_);
num_used_bits_ = nbits - remaining;
@@ -73,6 +71,7 @@ class DirectBitDecoder {
const uint32_t value_r = (*pos_) >> (32 - num_used_bits_);
*value = (value_l >> (32 - num_used_bits_ - remaining)) | value_r;
}
+ return true;
}
void EndDecoding() {}
diff --git a/contrib/draco/src/draco/compression/config/encoder_options.h b/contrib/draco/src/draco/compression/config/encoder_options.h
index ed1b02068..e8a55bbba 100644
--- a/contrib/draco/src/draco/compression/config/encoder_options.h
+++ b/contrib/draco/src/draco/compression/config/encoder_options.h
@@ -65,6 +65,10 @@ class EncoderOptionsBase : public DracoOptions {
this->SetGlobalInt("encoding_speed", encoding_speed);
this->SetGlobalInt("decoding_speed", decoding_speed);
}
+ bool IsSpeedSet() const {
+ return this->IsGlobalOptionSet("encoding_speed") ||
+ this->IsGlobalOptionSet("decoding_speed");
+ }
// Sets a given feature as supported or unsupported by the target decoder.
// Encoder will always use only supported features when encoding the input
diff --git a/contrib/draco/src/draco/compression/decode_test.cc b/contrib/draco/src/draco/compression/decode_test.cc
index 198714690..8f3e7f4e9 100644
--- a/contrib/draco/src/draco/compression/decode_test.cc
+++ b/contrib/draco/src/draco/compression/decode_test.cc
@@ -17,9 +17,11 @@
#include
#include
+#include "draco/compression/encode.h"
#include "draco/core/draco_test_base.h"
#include "draco/core/draco_test_utils.h"
#include "draco/io/file_utils.h"
+#include "draco/io/obj_encoder.h"
namespace {
@@ -166,4 +168,78 @@ TEST_F(DecodeTest, TestSkipAttributeTransformWithNoQuantization) {
ASSERT_EQ(pos_att->GetAttributeTransformData(), nullptr);
}
+TEST_F(DecodeTest, TestSkipAttributeTransformUniqueId) {
+ // Tests that decoders preserve unique id of attributes even when their
+ // attribute transforms are skipped.
+ const std::string file_name = "cube_att.obj";
+ auto src_mesh = draco::ReadMeshFromTestFile(file_name);
+ ASSERT_NE(src_mesh, nullptr);
+
+ constexpr int kPosUniqueId = 7;
+ constexpr int kNormUniqueId = 42;
+ // Set unique ids for some of the attributes.
+ src_mesh
+ ->attribute(
+ src_mesh->GetNamedAttributeId(draco::GeometryAttribute::POSITION))
+ ->set_unique_id(kPosUniqueId);
+ src_mesh
+ ->attribute(
+ src_mesh->GetNamedAttributeId(draco::GeometryAttribute::NORMAL))
+ ->set_unique_id(kNormUniqueId);
+
+ draco::EncoderBuffer encoder_buffer;
+ draco::Encoder encoder;
+ encoder.SetAttributeQuantization(draco::GeometryAttribute::POSITION, 10);
+ encoder.SetAttributeQuantization(draco::GeometryAttribute::NORMAL, 11);
+ encoder.EncodeMeshToBuffer(*src_mesh, &encoder_buffer);
+
+ // Create a draco decoding buffer.
+ draco::DecoderBuffer buffer;
+ buffer.Init(encoder_buffer.data(), encoder_buffer.size());
+
+ // First we decode the mesh without skipping the attribute transforms.
+ draco::Decoder decoder_no_skip;
+ std::unique_ptr mesh_no_skip =
+ decoder_no_skip.DecodeMeshFromBuffer(&buffer).value();
+ ASSERT_NE(mesh_no_skip, nullptr);
+
+ // Now we decode it again while skipping some attributes.
+ draco::Decoder decoder_skip;
+ // Make sure we skip dequantization for the position and normal attribute.
+ decoder_skip.SetSkipAttributeTransform(draco::GeometryAttribute::POSITION);
+ decoder_skip.SetSkipAttributeTransform(draco::GeometryAttribute::NORMAL);
+
+ // Decode the input data into a geometry.
+ buffer.Init(encoder_buffer.data(), encoder_buffer.size());
+ std::unique_ptr mesh_skip =
+ decoder_skip.DecodeMeshFromBuffer(&buffer).value();
+ ASSERT_NE(mesh_skip, nullptr);
+
+ // Compare the unique ids.
+ const draco::PointAttribute *const pos_att_no_skip =
+ mesh_no_skip->GetNamedAttribute(draco::GeometryAttribute::POSITION);
+ ASSERT_NE(pos_att_no_skip, nullptr);
+ ASSERT_EQ(pos_att_no_skip->data_type(), draco::DataType::DT_FLOAT32);
+
+ const draco::PointAttribute *const pos_att_skip =
+ mesh_skip->GetNamedAttribute(draco::GeometryAttribute::POSITION);
+ ASSERT_NE(pos_att_skip, nullptr);
+ ASSERT_EQ(pos_att_skip->data_type(), draco::DataType::DT_INT32);
+
+ const draco::PointAttribute *const norm_att_no_skip =
+ mesh_no_skip->GetNamedAttribute(draco::GeometryAttribute::NORMAL);
+ ASSERT_NE(norm_att_no_skip, nullptr);
+ ASSERT_EQ(norm_att_no_skip->data_type(), draco::DataType::DT_FLOAT32);
+
+ const draco::PointAttribute *const norm_att_skip =
+ mesh_skip->GetNamedAttribute(draco::GeometryAttribute::NORMAL);
+ ASSERT_NE(norm_att_skip, nullptr);
+ ASSERT_EQ(norm_att_skip->data_type(), draco::DataType::DT_INT32);
+
+ ASSERT_EQ(pos_att_skip->unique_id(), pos_att_no_skip->unique_id());
+ ASSERT_EQ(norm_att_skip->unique_id(), norm_att_no_skip->unique_id());
+ std::cout << pos_att_skip->unique_id() << " " << norm_att_skip->unique_id()
+ << std::endl;
+}
+
} // namespace
diff --git a/contrib/draco/src/draco/compression/draco_compression_options.cc b/contrib/draco/src/draco/compression/draco_compression_options.cc
new file mode 100644
index 000000000..08171c678
--- /dev/null
+++ b/contrib/draco/src/draco/compression/draco_compression_options.cc
@@ -0,0 +1,59 @@
+// Copyright 2022 The Draco Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#include "draco/compression/draco_compression_options.h"
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+namespace draco {
+
+SpatialQuantizationOptions::SpatialQuantizationOptions(int quantization_bits) {
+ SetQuantizationBits(quantization_bits);
+}
+
+void SpatialQuantizationOptions::SetQuantizationBits(int quantization_bits) {
+ mode_ = LOCAL_QUANTIZATION_BITS;
+ quantization_bits_ = quantization_bits;
+}
+
+bool SpatialQuantizationOptions::AreQuantizationBitsDefined() const {
+ return mode_ == LOCAL_QUANTIZATION_BITS;
+}
+
+SpatialQuantizationOptions &SpatialQuantizationOptions::SetGrid(float spacing) {
+ mode_ = GLOBAL_GRID;
+ spacing_ = spacing;
+ return *this;
+}
+
+bool SpatialQuantizationOptions::operator==(
+ const SpatialQuantizationOptions &other) const {
+ if (mode_ != other.mode_) {
+ return false;
+ }
+ if (mode_ == LOCAL_QUANTIZATION_BITS) {
+ if (quantization_bits_ != other.quantization_bits_) {
+ return false;
+ }
+ } else if (mode_ == GLOBAL_GRID) {
+ if (spacing_ != other.spacing_) {
+ return false;
+ }
+ }
+ return true;
+}
+
+} // namespace draco
+
+#endif // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/compression/draco_compression_options.h b/contrib/draco/src/draco/compression/draco_compression_options.h
new file mode 100644
index 000000000..31a4418ed
--- /dev/null
+++ b/contrib/draco/src/draco/compression/draco_compression_options.h
@@ -0,0 +1,141 @@
+// Copyright 2019 The Draco Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+#ifndef DRACO_COMPRESSION_DRACO_COMPRESSION_OPTIONS_H_
+#define DRACO_COMPRESSION_DRACO_COMPRESSION_OPTIONS_H_
+
+#include "draco/draco_features.h"
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+#include "draco/core/status.h"
+
+namespace draco {
+
+// Quantization options for positions. Currently there are two modes for
+// quantizing positions:
+//
+// 1. Quantization bits:
+// - User defined number of quantization bits that is evenly distributed
+// to cover the compressed geometry.
+// 2. Grid:
+// - Positions are snapped to a global grid defined by grid spacing.
+// - This method is primarily intended to be used when the location of
+// quantized vertices needs to be consistent between multiple
+// geometries.
+class SpatialQuantizationOptions {
+ public:
+ explicit SpatialQuantizationOptions(int quantization_bits);
+
+ // Sets quantization bits that are going to be used for the compressed
+ // geometry. If the geometry is a scene, the same number of quantization bits
+ // is going to be applied to each mesh of the scene. Quantized values are
+ // going to be distributed within the bounds of individual meshes.
+ void SetQuantizationBits(int quantization_bits);
+
+ // If this returns true, quantization_bits() should be used to get the
+ // desired number of quantization bits for compression. Otherwise the grid
+ // mode is selected and spacing() should be used to get the desired grid
+ // spacing.
+ bool AreQuantizationBitsDefined() const;
+ const int quantization_bits() const { return quantization_bits_; }
+
+ // Defines quantization grid used for the compressed geometry. All vertices
+ // are going to be snapped to the nearest grid vertex that corresponds to an
+ // integer quantized position. |spacing| defines the distance between two grid
+ // vertices. E.g. a grid with |spacing| = 10 would have grid vertices at
+ // locations {10 * i, 10 * j, 10 * k} where i, j, k are integer numbers.
+ SpatialQuantizationOptions &SetGrid(float spacing);
+
+ const float spacing() const { return spacing_; }
+
+ bool operator==(const SpatialQuantizationOptions &other) const;
+
+ private:
+ enum Mode { LOCAL_QUANTIZATION_BITS, GLOBAL_GRID };
+ Mode mode_ = LOCAL_QUANTIZATION_BITS;
+ int quantization_bits_; // Default quantization bits for positions.
+ float spacing_ = 0.f;
+};
+
+// TODO(fgalligan): Add support for unified_position_quantization.
+// Struct to hold Draco compression options.
+struct DracoCompressionOptions {
+ int compression_level = 7; // compression level [0-10], most=10, least=0.
+ SpatialQuantizationOptions quantization_position{11};
+ int quantization_bits_normal = 8;
+ int quantization_bits_tex_coord = 10;
+ int quantization_bits_color = 8;
+ int quantization_bits_generic = 8;
+ int quantization_bits_tangent = 8;
+ int quantization_bits_weight = 8;
+ bool find_non_degenerate_texture_quantization = false;
+
+ bool operator==(const DracoCompressionOptions &other) const {
+ return compression_level == other.compression_level &&
+ quantization_position == other.quantization_position &&
+ quantization_bits_normal == other.quantization_bits_normal &&
+ quantization_bits_tex_coord == other.quantization_bits_tex_coord &&
+ quantization_bits_color == other.quantization_bits_color &&
+ quantization_bits_generic == other.quantization_bits_generic &&
+ quantization_bits_tangent == other.quantization_bits_tangent &&
+ quantization_bits_weight == other.quantization_bits_weight &&
+ find_non_degenerate_texture_quantization ==
+ other.find_non_degenerate_texture_quantization;
+ }
+
+ bool operator!=(const DracoCompressionOptions &other) const {
+ return !(*this == other);
+ }
+
+ Status Check() const {
+ DRACO_RETURN_IF_ERROR(
+ Validate("Compression level", compression_level, 0, 10));
+ if (quantization_position.AreQuantizationBitsDefined()) {
+ DRACO_RETURN_IF_ERROR(Validate("Position quantization",
+ quantization_position.quantization_bits(),
+ 0, 30));
+ } else {
+ if (quantization_position.spacing() <= 0.f) {
+ return ErrorStatus("Position quantization spacing is invalid.");
+ }
+ }
+ DRACO_RETURN_IF_ERROR(
+ Validate("Normals quantization", quantization_bits_normal, 0, 30));
+ DRACO_RETURN_IF_ERROR(
+ Validate("Tex coord quantization", quantization_bits_tex_coord, 0, 30));
+ DRACO_RETURN_IF_ERROR(
+ Validate("Color quantization", quantization_bits_color, 0, 30));
+ DRACO_RETURN_IF_ERROR(
+ Validate("Generic quantization", quantization_bits_generic, 0, 30));
+ DRACO_RETURN_IF_ERROR(
+ Validate("Tangent quantization", quantization_bits_tangent, 0, 30));
+ DRACO_RETURN_IF_ERROR(
+ Validate("Weights quantization", quantization_bits_weight, 0, 30));
+ return OkStatus();
+ }
+
+ static Status Validate(const std::string &name, int value, int min, int max) {
+ if (value < min || value > max) {
+ const std::string range =
+ "[" + std::to_string(min) + "-" + std::to_string(max) + "].";
+ return Status(Status::DRACO_ERROR, name + " is out of range " + range);
+ }
+ return OkStatus();
+ }
+};
+
+} // namespace draco
+
+#endif // DRACO_TRANSCODER_SUPPORTED
+#endif // DRACO_COMPRESSION_DRACO_COMPRESSION_OPTIONS_H_
diff --git a/contrib/draco/src/draco/compression/draco_compression_options_test.cc b/contrib/draco/src/draco/compression/draco_compression_options_test.cc
new file mode 100644
index 000000000..415295211
--- /dev/null
+++ b/contrib/draco/src/draco/compression/draco_compression_options_test.cc
@@ -0,0 +1,45 @@
+#include "draco/compression/draco_compression_options.h"
+
+#include "draco/core/draco_test_utils.h"
+
+#ifdef DRACO_TRANSCODER_SUPPORTED
+
+namespace {
+
+TEST(DracoCompressionOptionsTest, TestPositionQuantizationBits) {
+ // Test verifies that we can define draco compression options using
+ // quantization bits.
+ draco::SpatialQuantizationOptions options(10);
+
+ // Quantization bits should be used by default.
+ ASSERT_TRUE(options.AreQuantizationBitsDefined());
+ ASSERT_EQ(options.quantization_bits(), 10);
+
+ // Change the quantization bits.
+ options.SetQuantizationBits(9);
+ ASSERT_TRUE(options.AreQuantizationBitsDefined());
+ ASSERT_EQ(options.quantization_bits(), 9);
+
+ // If we select the grid, quantization bits should not be used.
+ options.SetGrid(0.5f);
+ ASSERT_FALSE(options.AreQuantizationBitsDefined());
+}
+
+TEST(DracoCompressionOptionsTest, TestPositionQuantizationGrid) {
+ // Test verifies that we can define draco compression options using
+ // quantization grid.
+ draco::SpatialQuantizationOptions options(10);
+
+ // Quantization bits should be used by default.
+ ASSERT_TRUE(options.AreQuantizationBitsDefined());
+
+ // Set the grid parameters.
+ options.SetGrid(0.25f);
+ ASSERT_FALSE(options.AreQuantizationBitsDefined());
+
+ ASSERT_EQ(options.spacing(), 0.25f);
+}
+
+} // namespace
+
+#endif // DRACO_TRANSCODER_SUPPORTED
diff --git a/contrib/draco/src/draco/compression/encode.h b/contrib/draco/src/draco/compression/encode.h
index bce8b34c2..00ccb9b2e 100644
--- a/contrib/draco/src/draco/compression/encode.h
+++ b/contrib/draco/src/draco/compression/encode.h
@@ -129,7 +129,6 @@ class Encoder
// call of EncodePointCloudToBuffer or EncodeMeshToBuffer is going to fail.
void SetEncodingMethod(int encoding_method);
- protected:
// Creates encoder options for the expert encoder used during the actual
// encoding.
EncoderOptions CreateExpertEncoderOptions(const PointCloud &pc) const;
diff --git a/contrib/draco/src/draco/compression/encode_base.h b/contrib/draco/src/draco/compression/encode_base.h
index c501bc4fa..6211efc22 100644
--- a/contrib/draco/src/draco/compression/encode_base.h
+++ b/contrib/draco/src/draco/compression/encode_base.h
@@ -98,7 +98,7 @@ class EncoderBase {
"Invalid prediction scheme for attribute type.");
}
}
- // TODO(hemmer): Try to enable more prediction schemes for normals.
+ // TODO(b/199760123): Try to enable more prediction schemes for normals.
if (att_type == GeometryAttribute::NORMAL) {
if (!(prediction_scheme == PREDICTION_DIFFERENCE ||
prediction_scheme == MESH_PREDICTION_GEOMETRIC_NORMAL)) {
diff --git a/contrib/draco/src/draco/compression/encode_test.cc b/contrib/draco/src/draco/compression/encode_test.cc
index fde4f6f5b..00d834703 100644
--- a/contrib/draco/src/draco/compression/encode_test.cc
+++ b/contrib/draco/src/draco/compression/encode_test.cc
@@ -26,6 +26,7 @@
#include "draco/core/draco_test_base.h"
#include "draco/core/draco_test_utils.h"
#include "draco/core/vector_d.h"
+#include "draco/io/file_utils.h"
#include "draco/io/obj_decoder.h"
#include "draco/mesh/triangle_soup_mesh_builder.h"
#include "draco/point_cloud/point_cloud_builder.h"
@@ -213,16 +214,14 @@ class EncodeTest : public ::testing::Test {
draco::Decoder decoder;
if (mesh) {
- auto maybe_mesh = decoder.DecodeMeshFromBuffer(&decoder_buffer);
- ASSERT_TRUE(maybe_mesh.ok());
- auto decoded_mesh = std::move(maybe_mesh).value();
+ DRACO_ASSIGN_OR_ASSERT(auto decoded_mesh,
+ decoder.DecodeMeshFromBuffer(&decoder_buffer));
ASSERT_NE(decoded_mesh, nullptr);
ASSERT_EQ(decoded_mesh->num_points(), encoder.num_encoded_points());
ASSERT_EQ(decoded_mesh->num_faces(), encoder.num_encoded_faces());
} else {
- auto maybe_pc = decoder.DecodePointCloudFromBuffer(&decoder_buffer);
- ASSERT_TRUE(maybe_pc.ok());
- auto decoded_pc = std::move(maybe_pc).value();
+ DRACO_ASSIGN_OR_ASSERT(
+ auto decoded_pc, decoder.DecodePointCloudFromBuffer(&decoder_buffer));
ASSERT_EQ(decoded_pc->num_points(), encoder.num_encoded_points());
}
}
@@ -274,7 +273,7 @@ TEST_F(EncodeTest, TestLinesObj) {
encoder.SetAttributeQuantization(draco::GeometryAttribute::POSITION, 16);
draco::EncoderBuffer buffer;
- ASSERT_TRUE(encoder.EncodePointCloudToBuffer(*pc, &buffer).ok());
+ DRACO_ASSERT_OK(encoder.EncodePointCloudToBuffer(*pc, &buffer));
}
TEST_F(EncodeTest, TestQuantizedInfinity) {
@@ -315,7 +314,7 @@ TEST_F(EncodeTest, TestUnquantizedInfinity) {
encoder.SetEncodingMethod(draco::POINT_CLOUD_SEQUENTIAL_ENCODING);
draco::EncoderBuffer buffer;
- ASSERT_TRUE(encoder.EncodePointCloudToBuffer(*pc, &buffer).ok());
+ DRACO_ASSERT_OK(encoder.EncodePointCloudToBuffer(*pc, &buffer));
}
TEST_F(EncodeTest, TestQuantizedAndUnquantizedAttributes) {
@@ -330,7 +329,7 @@ TEST_F(EncodeTest, TestQuantizedAndUnquantizedAttributes) {
encoder.SetAttributeQuantization(draco::GeometryAttribute::POSITION, 11);
encoder.SetAttributeQuantization(draco::GeometryAttribute::NORMAL, 0);
draco::EncoderBuffer buffer;
- ASSERT_TRUE(encoder.EncodePointCloudToBuffer(*pc, &buffer).ok());
+ DRACO_ASSERT_OK(encoder.EncodePointCloudToBuffer(*pc, &buffer));
}
TEST_F(EncodeTest, TestKdTreeEncoding) {
@@ -348,7 +347,7 @@ TEST_F(EncodeTest, TestKdTreeEncoding) {
// Now set quantization for the position attribute which should make
// the encoder happy.
encoder.SetAttributeQuantization(draco::GeometryAttribute::POSITION, 16);
- ASSERT_TRUE(encoder.EncodePointCloudToBuffer(*pc, &buffer).ok());
+ DRACO_ASSERT_OK(encoder.EncodePointCloudToBuffer(*pc, &buffer));
}
TEST_F(EncodeTest, TestTrackingOfNumberOfEncodedEntries) {
@@ -373,7 +372,7 @@ TEST_F(EncodeTest, TestTrackingOfNumberOfEncodedEntriesNotSet) {
draco::EncoderBuffer buffer;
draco::Encoder encoder;
- ASSERT_TRUE(encoder.EncodeMeshToBuffer(*mesh, &buffer).ok());
+ DRACO_ASSERT_OK(encoder.EncodeMeshToBuffer(*mesh, &buffer));
ASSERT_EQ(encoder.num_encoded_points(), 0);
ASSERT_EQ(encoder.num_encoded_faces(), 0);
}
@@ -404,4 +403,170 @@ TEST_F(EncodeTest, TestNoPosQuantizationNormalCoding) {
ASSERT_NE(decoded_mesh, nullptr);
}
+#ifdef DRACO_TRANSCODER_SUPPORTED
+TEST_F(EncodeTest, TestDracoCompressionOptions) {
+ // This test verifies that we can set the encoder's compression options via
+ // draco::Mesh's compression options.
+ const auto mesh = draco::ReadMeshFromTestFile("test_nm.obj");
+ ASSERT_NE(mesh, nullptr);
+
+ // First set compression level and quantization manually.
+ draco::Encoder encoder_manual;
+ draco::EncoderBuffer buffer_manual;
+ encoder_manual.SetAttributeQuantization(draco::GeometryAttribute::POSITION,
+ 8);
+ encoder_manual.SetAttributeQuantization(draco::GeometryAttribute::NORMAL, 7);
+ encoder_manual.SetSpeedOptions(4, 4);
+
+ DRACO_ASSERT_OK(encoder_manual.EncodeMeshToBuffer(*mesh, &buffer_manual));
+
+ // Now do the same with options provided via DracoCompressionOptions.
+ draco::DracoCompressionOptions compression_options;
+ compression_options.compression_level = 6;
+ compression_options.quantization_position.SetQuantizationBits(8);
+ compression_options.quantization_bits_normal = 7;
+ mesh->SetCompressionOptions(compression_options);
+ mesh->SetCompressionEnabled(true);
+
+ draco::Encoder encoder_auto;
+ draco::EncoderBuffer buffer_auto;
+ DRACO_ASSERT_OK(encoder_auto.EncodeMeshToBuffer(*mesh, &buffer_auto));
+
+ // Ensure that both encoders produce the same result.
+ ASSERT_EQ(buffer_manual.size(), buffer_auto.size());
+
+ // Now change some of the mesh's compression settings and ensure the
+ // compression changes as well.
+ compression_options.compression_level = 7;
+ mesh->SetCompressionOptions(compression_options);
+ buffer_auto.Clear();
+ DRACO_ASSERT_OK(encoder_auto.EncodeMeshToBuffer(*mesh, &buffer_auto));
+ ASSERT_NE(buffer_manual.size(), buffer_auto.size());
+
+ // Check that |mesh| compression options do not override the encoder options.
+ mesh->GetCompressionOptions().compression_level = 10;
+ mesh->GetCompressionOptions().quantization_position.SetQuantizationBits(10);
+ mesh->GetCompressionOptions().quantization_bits_normal = 10;
+ draco::EncoderBuffer buffer;
+ DRACO_ASSERT_OK(encoder_manual.EncodeMeshToBuffer(*mesh, &buffer));
+ ASSERT_EQ(buffer.size(), buffer_manual.size());
+}
+
+TEST_F(EncodeTest, TestDracoCompressionOptionsManualOverride) {
+ // This test verifies that we can use encoder's option to override compression
+ // options provided in draco::Mesh's compression options.
+ const auto mesh = draco::ReadMeshFromTestFile("test_nm.obj");
+ ASSERT_NE(mesh, nullptr);
+
+ // Set some compression options.
+ draco::DracoCompressionOptions compression_options;
+ compression_options.compression_level = 6;
+ compression_options.quantization_position.SetQuantizationBits(8);
+ compression_options.quantization_bits_normal = 7;
+ mesh->SetCompressionOptions(compression_options);
+ mesh->SetCompressionEnabled(true);
+
+ draco::Encoder encoder;
+ draco::EncoderBuffer buffer_no_override;
+ DRACO_ASSERT_OK(encoder.EncodeMeshToBuffer(*mesh, &buffer_no_override));
+
+ // Now override some options and ensure the compression is different.
+ encoder.SetAttributeQuantization(draco::GeometryAttribute::POSITION, 5);
+ draco::EncoderBuffer buffer_with_override;
+ DRACO_ASSERT_OK(encoder.EncodeMeshToBuffer(*mesh, &buffer_with_override));
+ ASSERT_LT(buffer_with_override.size(), buffer_no_override.size());
+}
+
+TEST_F(EncodeTest, TestDracoCompressionOptionsGridQuantization) {
+ // Test verifies that we can set position quantization via grid spacing.
+
+ // 1x1x1 cube.
+ const auto mesh = draco::ReadMeshFromTestFile("cube_att.obj");
+ ASSERT_NE(mesh, nullptr);
+ mesh->SetCompressionEnabled(true);
+
+ // Set grid quantization for positions.
+ draco::DracoCompressionOptions compression_options;
+ // This should result in 10x10x10 quantization.
+ compression_options.quantization_position.SetGrid(0.1);
+ mesh->SetCompressionOptions(compression_options);
+
+ draco::ExpertEncoder encoder(*mesh);
+ draco::EncoderBuffer buffer;
+ DRACO_ASSERT_OK(encoder.EncodeToBuffer(&buffer));
+
+ // The grid options should be reflected in the |encoder|. Check that the
+ // computed values are correct.
+ const int pos_att_id =
+ mesh->GetNamedAttributeId(draco::GeometryAttribute::POSITION);
+ draco::Vector3f origin;
+ encoder.options().GetAttributeVector(pos_att_id, "quantization_origin", 3,
+ &origin[0]);
+ ASSERT_EQ(origin, draco::Vector3f(0.f, 0.f, 0.f));
+
+ // We need 4 quantization bits (for 10 values).
+ ASSERT_EQ(
+ encoder.options().GetAttributeInt(pos_att_id, "quantization_bits", -1),
+ 4);
+
+ // The quantization range should be ((1 << quantization_bits) - 1) * spacing.
+ ASSERT_NEAR(encoder.options().GetAttributeFloat(pos_att_id,
+ "quantization_range", 0.f),
+ 15.f * 0.1f, 1e-6f);
+}
+
+TEST_F(EncodeTest, TestDracoCompressionOptionsGridQuantizationWithOffset) {
+ // Test verifies that we can set position quantization via grid spacing when
+ // the geometry is not perfectly aligned with the quantization grid.
+
+ // 1x1x1 cube.
+ const auto mesh = draco::ReadMeshFromTestFile("cube_att.obj");
+ ASSERT_NE(mesh, nullptr);
+
+ // Move all positions a bit.
+ auto *pos_att = mesh->attribute(
+ mesh->GetNamedAttributeId(draco::GeometryAttribute::POSITION));
+ for (draco::AttributeValueIndex avi(0); avi < pos_att->size(); ++avi) {
+ draco::Vector3f pos;
+ pos_att->GetValue(avi, &pos[0]);
+ pos = pos + draco::Vector3f(-0.55f, 0.65f, 10.75f);
+ pos_att->SetAttributeValue(avi, &pos[0]);
+ }
+
+ mesh->SetCompressionEnabled(true);
+
+ // Set grid quantization for positions.
+ draco::DracoCompressionOptions compression_options;
+ // This should result in 16x16x16 quantization if the grid was perfectly
+ // aligned but since it is not we should expect 17 or 18 values per component.
+ compression_options.quantization_position.SetGrid(0.0625f);
+ mesh->SetCompressionOptions(compression_options);
+
+ draco::ExpertEncoder encoder(*mesh);
+ draco::EncoderBuffer buffer;
+ DRACO_ASSERT_OK(encoder.EncodeToBuffer(&buffer));
+
+ // The grid options should be reflected in the |encoder|. Check that the
+ // computed values are correct.
+ const int pos_att_id =
+ mesh->GetNamedAttributeId(draco::GeometryAttribute::POSITION);
+ draco::Vector3f origin;
+ encoder.options().GetAttributeVector(pos_att_id, "quantization_origin", 3,
+ &origin[0]);
+ // The origin is the first lower value on the quantization grid for each
+ // component of the mesh.
+ ASSERT_EQ(origin, draco::Vector3f(-0.5625f, 0.625f, 10.75f));
+
+ // We need 5 quantization bits (for 17-18 values).
+ ASSERT_EQ(
+ encoder.options().GetAttributeInt(pos_att_id, "quantization_bits", -1),
+ 5);
+
+ // The quantization range should be ((1 << quantization_bits) - 1) * spacing.
+ ASSERT_NEAR(encoder.options().GetAttributeFloat(pos_att_id,
+ "quantization_range", 0.f),
+ 31.f * 0.0625f, 1e-6f);
+}
+#endif // DRACO_TRANSCODER_SUPPORTED
+
} // namespace
diff --git a/contrib/draco/src/draco/compression/entropy/ans.h b/contrib/draco/src/draco/compression/entropy/ans.h
index c71d58975..313546fee 100644
--- a/contrib/draco/src/draco/compression/entropy/ans.h
+++ b/contrib/draco/src/draco/compression/entropy/ans.h
@@ -391,7 +391,6 @@ class RAnsEncoder {
ans_.buf[ans_.buf_offset++] = ans_.state % DRACO_ANS_IO_BASE;
ans_.state /= DRACO_ANS_IO_BASE;
}
- // TODO(ostava): The division and multiplication should be optimized.
ans_.state =
(ans_.state / p) * rans_precision + ans_.state % p + sym->cum_prob;
}
diff --git a/contrib/draco/src/draco/compression/entropy/rans_symbol_decoder.h b/contrib/draco/src/draco/compression/entropy/rans_symbol_decoder.h
index 10cdc6781..3b408c079 100644
--- a/contrib/draco/src/draco/compression/entropy/rans_symbol_decoder.h
+++ b/contrib/draco/src/draco/compression/entropy/rans_symbol_decoder.h
@@ -75,6 +75,13 @@ bool RAnsSymbolDecoder::Create(
return false;
}
}
+ // Check that decoded number of symbols is not unreasonably high. Remaining
+ // buffer size must be at least |num_symbols| / 64 bytes to contain the
+ // probability table. The |prob_data| below is one byte but it can be
+ // theoretically stored for each 64th symbol.
+ if (num_symbols_ / 64 > buffer->remaining_size()) {
+ return false;
+ }
probability_table_.resize(num_symbols_);
if (num_symbols_ == 0) {
return true;
diff --git a/contrib/draco/src/draco/compression/entropy/rans_symbol_encoder.h b/contrib/draco/src/draco/compression/entropy/rans_symbol_encoder.h
index 4e07ec871..4b738b50a 100644
--- a/contrib/draco/src/draco/compression/entropy/rans_symbol_encoder.h
+++ b/contrib/draco/src/draco/compression/entropy/rans_symbol_encoder.h
@@ -125,8 +125,8 @@ bool RAnsSymbolEncoder::Create(
for (int i = 0; i < num_symbols; ++i) {
sorted_probabilities[i] = i;
}
- std::sort(sorted_probabilities.begin(), sorted_probabilities.end(),
- ProbabilityLess(&probability_table_));
+ std::stable_sort(sorted_probabilities.begin(), sorted_probabilities.end(),
+ ProbabilityLess(&probability_table_));
if (total_rans_prob < rans_precision_) {
// This happens rather infrequently, just add the extra needed precision
// to the most frequent symbol.
diff --git a/contrib/draco/src/draco/compression/entropy/symbol_decoding.cc b/contrib/draco/src/draco/compression/entropy/symbol_decoding.cc
index 93d29971c..79e811818 100644
--- a/contrib/draco/src/draco/compression/entropy/symbol_decoding.cc
+++ b/contrib/draco/src/draco/compression/entropy/symbol_decoding.cc
@@ -72,7 +72,7 @@ bool DecodeTaggedSymbols(uint32_t num_values, int num_components,
int value_id = 0;
for (uint32_t i = 0; i < num_values; i += num_components) {
// Decode the tag.
- const int bit_length = tag_decoder.DecodeSymbol();
+ const uint32_t bit_length = tag_decoder.DecodeSymbol();
// Decode the actual value.
for (int j = 0; j < num_components; ++j) {
uint32_t val;
diff --git a/contrib/draco/src/draco/compression/expert_encode.cc b/contrib/draco/src/draco/compression/expert_encode.cc
index f9aec15eb..a3e649193 100644
--- a/contrib/draco/src/draco/compression/expert_encode.cc
+++ b/contrib/draco/src/draco/compression/expert_encode.cc
@@ -14,6 +14,12 @@
//
#include "draco/compression/expert_encode.h"
+#include
+#include
+#include
+#include
+#include
+
#include "draco/compression/mesh/mesh_edgebreaker_encoder.h"
#include "draco/compression/mesh/mesh_sequential_encoder.h"
#ifdef DRACO_POINT_CLOUD_COMPRESSION_SUPPORTED
@@ -21,6 +27,9 @@
#include "draco/compression/point_cloud/point_cloud_sequential_encoder.h"
#endif
+#ifdef DRACO_TRANSCODER_SUPPORTED
+#include "draco/core/bit_utils.h"
+#endif
namespace draco {
ExpertEncoder::ExpertEncoder(const PointCloud &point_cloud)
@@ -101,6 +110,11 @@ Status ExpertEncoder::EncodePointCloudToBuffer(const PointCloud &pc,
Status ExpertEncoder::EncodeMeshToBuffer(const Mesh &m,
EncoderBuffer *out_buffer) {
+#ifdef DRACO_TRANSCODER_SUPPORTED
+ // Apply DracoCompressionOptions associated with the mesh.
+ DRACO_RETURN_IF_ERROR(ApplyCompressionOptions(m));
+#endif // DRACO_TRANSCODER_SUPPORTED
+
std::unique_ptr encoder;
// Select the encoding method only based on the provided options.
int encoding_method = options().GetGlobalInt("encoding_method", -1);
@@ -118,6 +132,7 @@ Status ExpertEncoder::EncodeMeshToBuffer(const Mesh &m,
encoder = std::unique_ptr(new MeshSequentialEncoder());
}
encoder->SetMesh(m);
+
DRACO_RETURN_IF_ERROR(encoder->Encode(options(), out_buffer));
set_num_encoded_points(encoder->num_encoded_points());
@@ -179,4 +194,107 @@ Status ExpertEncoder::SetAttributePredictionScheme(
return status;
}
+#ifdef DRACO_TRANSCODER_SUPPORTED
+Status ExpertEncoder::ApplyCompressionOptions(const Mesh &mesh) {
+ if (!mesh.IsCompressionEnabled()) {
+ return OkStatus();
+ }
+ const auto &compression_options = mesh.GetCompressionOptions();
+
+ // Set any encoder options that haven't been explicitly set by users (don't
+ // override existing options).
+ if (!options().IsSpeedSet()) {
+ options().SetSpeed(10 - compression_options.compression_level,
+ 10 - compression_options.compression_level);
+ }
+
+ for (int ai = 0; ai < mesh.num_attributes(); ++ai) {
+ if (options().IsAttributeOptionSet(ai, "quantization_bits")) {
+ continue; // Don't override options that have been set.
+ }
+ int quantization_bits = 0;
+ const auto type = mesh.attribute(ai)->attribute_type();
+ switch (type) {
+ case GeometryAttribute::POSITION:
+ if (compression_options.quantization_position
+ .AreQuantizationBitsDefined()) {
+ quantization_bits =
+ compression_options.quantization_position.quantization_bits();
+ } else {
+ DRACO_RETURN_IF_ERROR(ApplyGridQuantization(mesh, ai));
+ }
+ break;
+ case GeometryAttribute::TEX_COORD:
+ quantization_bits = compression_options.quantization_bits_tex_coord;
+ break;
+ case GeometryAttribute::NORMAL:
+ quantization_bits = compression_options.quantization_bits_normal;
+ break;
+ case GeometryAttribute::COLOR:
+ quantization_bits = compression_options.quantization_bits_color;
+ break;
+ case GeometryAttribute::TANGENT:
+ quantization_bits = compression_options.quantization_bits_tangent;
+ break;
+ case GeometryAttribute::WEIGHTS:
+ quantization_bits = compression_options.quantization_bits_weight;
+ break;
+ case GeometryAttribute::GENERIC:
+ quantization_bits = compression_options.quantization_bits_generic;
+ break;
+ default:
+ break;
+ }
+ if (quantization_bits > 0) {
+ options().SetAttributeInt(ai, "quantization_bits", quantization_bits);
+ }
+ }
+ return OkStatus();
+}
+
+Status ExpertEncoder::ApplyGridQuantization(const Mesh &mesh,
+ int attribute_index) {
+ const auto compression_options = mesh.GetCompressionOptions();
+ if (mesh.attribute(attribute_index)->num_components() != 3) {
+ return ErrorStatus(
+ "Invalid number of components: Grid quantization is currently "
+ "supported only for 3D positions.");
+ }
+ const float spacing = compression_options.quantization_position.spacing();
+ // Compute quantization properties based on the grid spacing.
+ const auto &bbox = mesh.ComputeBoundingBox();
+ // Snap min and max points of the |bbox| to the quantization grid vertices.
+ Vector3f min_pos;
+ int num_values = 0; // Number of values that we need to encode.
+ for (int c = 0; c < 3; ++c) {
+ // Min / max position on grid vertices in grid coordinates.
+ const float min_grid_pos = floor(bbox.GetMinPoint()[c] / spacing);
+ const float max_grid_pos = ceil(bbox.GetMaxPoint()[c] / spacing);
+
+ // Min pos on grid vertex in mesh coordinates.
+ min_pos[c] = min_grid_pos * spacing;
+
+ const float component_num_values =
+ static_cast(max_grid_pos) - static_cast(min_grid_pos) + 1;
+ if (component_num_values > num_values) {
+ num_values = component_num_values;
+ }
+ }
+ // Now compute the number of bits needed to encode |num_values|.
+ int bits = MostSignificantBit(num_values);
+ if ((1 << bits) < num_values) {
+ // If the |num_values| is larger than number of values representable by
+ // |bits|, we need to use one more bit. This will be almost always true
+ // unless |num_values| was equal to 1 << |bits|.
+ bits++;
+ }
+ // Compute the range in mesh coordinates that matches the quantization bits.
+ // Note there are n-1 intervals between the |n| quantization values.
+ const float range = ((1 << bits) - 1) * spacing;
+ SetAttributeExplicitQuantization(attribute_index, bits, 3, min_pos.data(),
+ range);
+ return OkStatus();
+}
+#endif // DRACO_TRANSCODER_SUPPORTED
+
} // namespace draco
diff --git a/contrib/draco/src/draco/compression/expert_encode.h b/contrib/draco/src/draco/compression/expert_encode.h
index ea59393d3..5c1485e1e 100644
--- a/contrib/draco/src/draco/compression/expert_encode.h
+++ b/contrib/draco/src/draco/compression/expert_encode.h
@@ -138,6 +138,12 @@ class ExpertEncoder : public EncoderBase {
Status EncodeMeshToBuffer(const Mesh &m, EncoderBuffer *out_buffer);
+#ifdef DRACO_TRANSCODER_SUPPORTED
+ // Applies compression options stored in |mesh|.
+ Status ApplyCompressionOptions(const Mesh &mesh);
+ Status ApplyGridQuantization(const Mesh &mesh, int attribute_index);
+#endif // DRACO_TRANSCODER_SUPPORTED
+
const PointCloud *point_cloud_;
const Mesh *mesh_;
};
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_decoder_impl.cc b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_decoder_impl.cc
index 0bbbea4af..21ad9959c 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_decoder_impl.cc
+++ b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_decoder_impl.cc
@@ -454,7 +454,7 @@ bool MeshEdgebreakerDecoderImpl::DecodeConnectivity() {
#endif
// Decode connectivity of non-position attributes.
- if (attribute_data_.size() > 0) {
+ if (!attribute_data_.empty()) {
#ifdef DRACO_BACKWARDS_COMPATIBILITY_SUPPORTED
if (decoder_->bitstream_version() < DRACO_BITSTREAM_VERSION(2, 1)) {
for (CornerIndex ci(0); ci < corner_table_->num_corners(); ci += 3) {
@@ -484,7 +484,10 @@ bool MeshEdgebreakerDecoderImpl::DecodeConnectivity() {
attribute_data_[i].connectivity_data.AddSeamEdge(CornerIndex(c));
}
// Recompute vertices from the newly added seam edges.
- attribute_data_[i].connectivity_data.RecomputeVertices(nullptr, nullptr);
+ if (!attribute_data_[i].connectivity_data.RecomputeVertices(nullptr,
+ nullptr)) {
+ return false;
+ }
}
pos_encoding_data_.Init(corner_table_->num_vertices());
@@ -574,6 +577,17 @@ int MeshEdgebreakerDecoderImpl::DecodeConnectivity(
const CornerIndex corner_b =
corner_table_->Next(corner_table_->LeftMostCorner(vertex_x));
+ if (corner_a == corner_b) {
+ // All matched corners must be different.
+ return -1;
+ }
+ if (corner_table_->Opposite(corner_a) != kInvalidCornerIndex ||
+ corner_table_->Opposite(corner_b) != kInvalidCornerIndex) {
+ // One of the corners is already opposite to an existing face, which
+ // should not happen unless the input was tampered with.
+ return -1;
+ }
+
// New tip corner.
const CornerIndex corner(3 * face.value());
// Update opposite corner mappings.
@@ -616,6 +630,11 @@ int MeshEdgebreakerDecoderImpl::DecodeConnectivity(
return -1;
}
const CornerIndex corner_a = active_corner_stack.back();
+ if (corner_table_->Opposite(corner_a) != kInvalidCornerIndex) {
+ // Active corner is already opposite to an existing face, which should
+ // not happen unless the input was tampered with.
+ return -1;
+ }
// First corner on the new face is either corner "l" or "r".
const CornerIndex corner(3 * face.value());
@@ -681,10 +700,14 @@ int MeshEdgebreakerDecoderImpl::DecodeConnectivity(
}
const CornerIndex corner_a = active_corner_stack.back();
+ if (corner_a == corner_b) {
+ // All matched corners must be different.
+ return -1;
+ }
if (corner_table_->Opposite(corner_a) != kInvalidCornerIndex ||
corner_table_->Opposite(corner_b) != kInvalidCornerIndex) {
// One of the corners is already opposite to an existing face, which
- // should not happen unless the input was tempered with.
+ // should not happen unless the input was tampered with.
return -1;
}
@@ -713,9 +736,15 @@ int MeshEdgebreakerDecoderImpl::DecodeConnectivity(
// Also update the vertex id at corner "n" and all corners that are
// connected to it in the CCW direction.
+ const CornerIndex first_corner = corner_n;
while (corner_n != kInvalidCornerIndex) {
corner_table_->MapCornerToVertex(corner_n, vertex_p);
corner_n = corner_table_->SwingLeft(corner_n);
+ if (corner_n == first_corner) {
+ // We reached the start again which should not happen for split
+ // symbols.
+ return -1;
+ }
}
// Make sure the old vertex n is now mapped to an invalid corner (make it
// isolated).
@@ -800,7 +829,7 @@ int MeshEdgebreakerDecoderImpl::DecodeConnectivity(
return -1; // Unexpected number of decoded vertices.
}
// Decode start faces and connect them to the faces from the active stack.
- while (active_corner_stack.size() > 0) {
+ while (!active_corner_stack.empty()) {
const CornerIndex corner = active_corner_stack.back();
active_corner_stack.pop_back();
const bool interior_face =
@@ -842,6 +871,18 @@ int MeshEdgebreakerDecoderImpl::DecodeConnectivity(
const CornerIndex corner_c =
corner_table_->Next(corner_table_->LeftMostCorner(vert_x));
+ if (corner == corner_b || corner == corner_c || corner_b == corner_c) {
+ // All matched corners must be different.
+ return -1;
+ }
+ if (corner_table_->Opposite(corner) != kInvalidCornerIndex ||
+ corner_table_->Opposite(corner_b) != kInvalidCornerIndex ||
+ corner_table_->Opposite(corner_c) != kInvalidCornerIndex) {
+ // One of the corners is already opposite to an existing face, which
+ // should not happen unless the input was tampered with.
+ return -1;
+ }
+
const VertexIndex vert_p =
corner_table_->Vertex(corner_table_->Next(corner_c));
@@ -894,6 +935,11 @@ int MeshEdgebreakerDecoderImpl::DecodeConnectivity(
VertexCornersIterator vcit(corner_table_.get(), src_vert);
for (; !vcit.End(); ++vcit) {
const CornerIndex cid = vcit.Corner();
+ if (corner_table_->Vertex(cid) != src_vert) {
+ // Vertex mapped to |cid| was not |src_vert|. This indicates corrupted
+ // data and we should terminate the decoding.
+ return -1;
+ }
corner_table_->MapCornerToVertex(cid, invalid_vert);
}
corner_table_->SetLeftMostCorner(invalid_vert,
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder.cc b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder.cc
index 5aff5d8cc..a7f381480 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder.cc
+++ b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder.cc
@@ -31,7 +31,6 @@ bool MeshEdgebreakerEncoder::InitializeEncoder() {
impl_ = nullptr;
// For tiny meshes it's usually better to use the basic edgebreaker as the
// overhead of the predictive one may turn out to be too big.
- // TODO(b/111065939): Check if this can be improved.
const bool is_tiny_mesh = mesh()->num_faces() < 1000;
int selected_edgebreaker_method =
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.cc b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.cc
index 0791dc670..4bf6aa920 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.cc
+++ b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.cc
@@ -408,7 +408,7 @@ Status MeshEdgebreakerEncoderImpl::EncodeConnectivity() {
init_face_connectivity_corners.begin(),
init_face_connectivity_corners.end());
// Encode connectivity for all non-position attributes.
- if (attribute_data_.size() > 0) {
+ if (!attribute_data_.empty()) {
// Use the same order of corner that will be used by the decoder.
visited_faces_.assign(mesh_->num_faces(), false);
for (CornerIndex ci : processed_connectivity_corners_) {
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.h b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.h
index fb3377163..979e1d373 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.h
+++ b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoder_impl.h
@@ -177,7 +177,6 @@ class MeshEdgebreakerEncoderImpl : public MeshEdgebreakerEncoderImplInterface {
uint32_t num_split_symbols_;
// Struct holding data used for encoding each non-position attribute.
- // TODO(ostava): This should be probably renamed to something better.
struct AttributeData {
AttributeData() : attribute_index(-1), is_connectivity_used(true) {}
int attribute_index;
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoding_test.cc b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoding_test.cc
index 831388245..523303b09 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoding_test.cc
+++ b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_encoding_test.cc
@@ -44,7 +44,7 @@ class MeshEdgebreakerEncodingTest : public ::testing::Test {
EncoderOptions encoder_options = EncoderOptions::CreateDefaultOptions();
encoder_options.SetSpeed(10 - compression_level, 10 - compression_level);
encoder.SetMesh(*mesh);
- ASSERT_TRUE(encoder.Encode(encoder_options, &buffer).ok());
+ DRACO_ASSERT_OK(encoder.Encode(encoder_options, &buffer));
DecoderBuffer dec_buffer;
dec_buffer.Init(buffer.data(), buffer.size());
@@ -52,15 +52,14 @@ class MeshEdgebreakerEncodingTest : public ::testing::Test {
std::unique_ptr decoded_mesh(new Mesh());
DecoderOptions dec_options;
- ASSERT_TRUE(
- decoder.Decode(dec_options, &dec_buffer, decoded_mesh.get()).ok());
+ DRACO_ASSERT_OK(
+ decoder.Decode(dec_options, &dec_buffer, decoded_mesh.get()));
// Cleanup the input mesh to make sure that input and output can be
// compared (edgebreaker method discards degenerated triangles and isolated
// vertices).
const MeshCleanupOptions options;
- MeshCleanup cleanup;
- ASSERT_TRUE(cleanup(mesh, options)) << "Failed to clean the input mesh.";
+ DRACO_ASSERT_OK(MeshCleanup::Cleanup(mesh, options));
MeshAreEquivalent eq;
ASSERT_TRUE(eq(*mesh, *decoded_mesh.get()))
@@ -102,8 +101,8 @@ TEST_F(MeshEdgebreakerEncodingTest, TestEncoderReuse) {
EncoderOptions encoder_options = EncoderOptions::CreateDefaultOptions();
encoder.SetMesh(*mesh);
EncoderBuffer buffer_0, buffer_1;
- ASSERT_TRUE(encoder.Encode(encoder_options, &buffer_0).ok());
- ASSERT_TRUE(encoder.Encode(encoder_options, &buffer_1).ok());
+ DRACO_ASSERT_OK(encoder.Encode(encoder_options, &buffer_0));
+ DRACO_ASSERT_OK(encoder.Encode(encoder_options, &buffer_1));
// Make sure both buffer are identical.
ASSERT_EQ(buffer_0.size(), buffer_1.size());
@@ -123,7 +122,7 @@ TEST_F(MeshEdgebreakerEncodingTest, TestDecoderReuse) {
EncoderOptions encoder_options = EncoderOptions::CreateDefaultOptions();
encoder.SetMesh(*mesh);
EncoderBuffer buffer;
- ASSERT_TRUE(encoder.Encode(encoder_options, &buffer).ok());
+ DRACO_ASSERT_OK(encoder.Encode(encoder_options, &buffer));
DecoderBuffer dec_buffer;
dec_buffer.Init(buffer.data(), buffer.size());
@@ -133,13 +132,13 @@ TEST_F(MeshEdgebreakerEncodingTest, TestDecoderReuse) {
// Decode the mesh two times.
std::unique_ptr decoded_mesh_0(new Mesh());
DecoderOptions dec_options;
- ASSERT_TRUE(
- decoder.Decode(dec_options, &dec_buffer, decoded_mesh_0.get()).ok());
+ DRACO_ASSERT_OK(
+ decoder.Decode(dec_options, &dec_buffer, decoded_mesh_0.get()));
dec_buffer.Init(buffer.data(), buffer.size());
std::unique_ptr decoded_mesh_1(new Mesh());
- ASSERT_TRUE(
- decoder.Decode(dec_options, &dec_buffer, decoded_mesh_1.get()).ok());
+ DRACO_ASSERT_OK(
+ decoder.Decode(dec_options, &dec_buffer, decoded_mesh_1.get()));
// Make sure both of the meshes are identical.
MeshAreEquivalent eq;
@@ -169,7 +168,7 @@ TEST_F(MeshEdgebreakerEncodingTest, TestSingleConnectivityEncoding) {
encoder.SetAttributeQuantization(GeometryAttribute::TEX_COORD, 8);
encoder.SetAttributeQuantization(GeometryAttribute::NORMAL, 8);
encoder.SetEncodingMethod(MESH_EDGEBREAKER_ENCODING);
- ASSERT_TRUE(encoder.EncodeMeshToBuffer(*mesh, &buffer).ok());
+ DRACO_ASSERT_OK(encoder.EncodeMeshToBuffer(*mesh, &buffer));
DecoderBuffer dec_buffer;
dec_buffer.Init(buffer.data(), buffer.size());
@@ -216,7 +215,7 @@ TEST_F(MeshEdgebreakerEncodingTest, TestWrongAttributeOrder) {
encoder.SetAttributeQuantization(GeometryAttribute::POSITION, 8);
encoder.SetAttributeQuantization(GeometryAttribute::NORMAL, 8);
encoder.SetEncodingMethod(MESH_EDGEBREAKER_ENCODING);
- ASSERT_TRUE(encoder.EncodeMeshToBuffer(*mesh, &buffer).ok());
+ DRACO_ASSERT_OK(encoder.EncodeMeshToBuffer(*mesh, &buffer));
DecoderBuffer dec_buffer;
dec_buffer.Init(buffer.data(), buffer.size());
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_shared.h b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_shared.h
index cb3c29dd6..c650bc352 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_shared.h
+++ b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_shared.h
@@ -50,8 +50,6 @@ namespace draco {
// \ / S \ / / E \
// *-------* *-------*
//
-// TODO(ostava): Get rid of the topology bit pattern. It's important only for
-// encoding but the algorithms should use EdgebreakerSymbol instead.
enum EdgebreakerTopologyBitPattern {
TOPOLOGY_C = 0x0, // 0
TOPOLOGY_S = 0x1, // 1 0 0
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_traversal_valence_decoder.h b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_traversal_valence_decoder.h
index c00373727..89553e909 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_traversal_valence_decoder.h
+++ b/contrib/draco/src/draco/compression/mesh/mesh_edgebreaker_traversal_valence_decoder.h
@@ -129,7 +129,11 @@ class MeshEdgebreakerTraversalValenceDecoder
if (context_counter < 0) {
return TOPOLOGY_INVALID;
}
- const int symbol_id = context_symbols_[active_context_][context_counter];
+ const uint32_t symbol_id =
+ context_symbols_[active_context_][context_counter];
+ if (symbol_id > 4) {
+ return TOPOLOGY_INVALID;
+ }
last_symbol_ = edge_breaker_symbol_to_topology_id[symbol_id];
} else {
#ifdef DRACO_BACKWARDS_COMPATIBILITY_SUPPORTED
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_encoder_test.cc b/contrib/draco/src/draco/compression/mesh/mesh_encoder_test.cc
index 55f683696..2dfdb58ef 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_encoder_test.cc
+++ b/contrib/draco/src/draco/compression/mesh/mesh_encoder_test.cc
@@ -78,9 +78,10 @@ class MeshEncoderTest : public ::testing::TestWithParam {
encoder.SetAttributeQuantization(i, 12);
}
EncoderBuffer buffer;
- ASSERT_TRUE(encoder.EncodeToBuffer(&buffer).ok())
- << "Failed encoding test mesh " << file_name << " with method "
- << GetParam().encoding_method;
+ const Status status = encoder.EncodeToBuffer(&buffer);
+ EXPECT_TRUE(status.ok()) << "Failed encoding test mesh " << file_name
+ << " with method " << GetParam().encoding_method;
+ DRACO_ASSERT_OK(status);
// Check that the encoded mesh was really encoded with the selected method.
DecoderBuffer decoder_buffer;
decoder_buffer.Init(buffer.data(), buffer.size());
@@ -88,6 +89,7 @@ class MeshEncoderTest : public ::testing::TestWithParam {
uint8_t encoded_method;
ASSERT_TRUE(decoder_buffer.Decode(&encoded_method));
ASSERT_EQ(encoded_method, method);
+
if (!FLAGS_update_golden_files) {
EXPECT_TRUE(
CompareGoldenFile(golden_file_name, buffer.data(), buffer.size()))
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_sequential_decoder.cc b/contrib/draco/src/draco/compression/mesh/mesh_sequential_decoder.cc
index be349f543..595a487a4 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_sequential_decoder.cc
+++ b/contrib/draco/src/draco/compression/mesh/mesh_sequential_decoder.cc
@@ -96,7 +96,7 @@ bool MeshSequentialDecoder::DecodeConnectivity() {
}
mesh()->AddFace(face);
}
- } else if (mesh()->num_points() < (1 << 21) &&
+ } else if (num_points < (1 << 21) &&
bitstream_version() >= DRACO_BITSTREAM_VERSION(2, 2)) {
// Decode indices as uint32_t.
for (uint32_t i = 0; i < num_faces; ++i) {
@@ -158,6 +158,10 @@ bool MeshSequentialDecoder::DecodeAndDecompressIndices(uint32_t num_faces) {
index_diff = -index_diff;
}
const int32_t index_value = index_diff + last_index_value;
+ if (index_value < 0) {
+ // Negative indices are not allowed.
+ return false;
+ }
face[j] = index_value;
last_index_value = index_value;
}
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_sequential_encoder.cc b/contrib/draco/src/draco/compression/mesh/mesh_sequential_encoder.cc
index 02ac7779e..fd8b11392 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_sequential_encoder.cc
+++ b/contrib/draco/src/draco/compression/mesh/mesh_sequential_encoder.cc
@@ -32,8 +32,6 @@ Status MeshSequentialEncoder::EncodeConnectivity() {
EncodeVarint(static_cast(mesh()->num_points()), buffer());
// We encode all attributes in the original (possibly duplicated) format.
- // TODO(ostava): This may not be optimal if we have only one attribute or if
- // all attributes share the same index mapping.
if (options()->GetGlobalBool("compress_connectivity", false)) {
// 0 = Encode compressed indices.
buffer()->Encode(static_cast(0));
@@ -44,8 +42,6 @@ Status MeshSequentialEncoder::EncodeConnectivity() {
// 1 = Encode indices directly.
buffer()->Encode(static_cast(1));
// Store vertex indices using a smallest data type that fits their range.
- // TODO(ostava): This can be potentially improved by using a tighter
- // fit that is not bound by a bit-length of any particular data type.
if (mesh()->num_points() < 256) {
// Serialize indices as uint8_t.
for (FaceIndex i(0); i < num_faces; ++i) {
diff --git a/contrib/draco/src/draco/compression/mesh/mesh_sequential_encoder.h b/contrib/draco/src/draco/compression/mesh/mesh_sequential_encoder.h
index 672609642..6e2b05877 100644
--- a/contrib/draco/src/draco/compression/mesh/mesh_sequential_encoder.h
+++ b/contrib/draco/src/draco/compression/mesh/mesh_sequential_encoder.h
@@ -33,7 +33,6 @@ namespace draco {
// Class that encodes mesh data using a simple binary representation of mesh's
// connectivity and geometry.
-// TODO(ostava): Use a better name.
class MeshSequentialEncoder : public MeshEncoder {
public:
MeshSequentialEncoder();
diff --git a/contrib/draco/src/draco/compression/mesh/traverser/mesh_attribute_indices_encoding_observer.h b/contrib/draco/src/draco/compression/mesh/traverser/mesh_attribute_indices_encoding_observer.h
index e66dd14b2..dd9738ba2 100644
--- a/contrib/draco/src/draco/compression/mesh/traverser/mesh_attribute_indices_encoding_observer.h
+++ b/contrib/draco/src/draco/compression/mesh/traverser/mesh_attribute_indices_encoding_observer.h
@@ -25,7 +25,7 @@ namespace draco {
// values based on the traversal of the encoded mesh. The class should be used
// as the TraversalObserverT member of a Traverser class such as the
// DepthFirstTraverser (depth_first_traverser.h).
-// TODO(hemmer): rename to AttributeIndicesCodingTraverserObserver
+// TODO(b/199760123): Rename to AttributeIndicesCodingTraverserObserver.
template
class MeshAttributeIndicesEncodingObserver {
public:
diff --git a/contrib/draco/src/draco/compression/mesh/traverser/mesh_traversal_sequencer.h b/contrib/draco/src/draco/compression/mesh/traverser/mesh_traversal_sequencer.h
index ebe1d5f7a..e55c93a79 100644
--- a/contrib/draco/src/draco/compression/mesh/traverser/mesh_traversal_sequencer.h
+++ b/contrib/draco/src/draco/compression/mesh/traverser/mesh_traversal_sequencer.h
@@ -25,7 +25,7 @@ namespace draco {
// Sequencer that generates point sequence in an order given by a deterministic
// traversal on the mesh surface. Note that all attributes encoded with this
// sequence must share the same connectivity.
-// TODO(hemmer): Consider refactoring such that this is an observer.
+// TODO(b/199760123): Consider refactoring such that this is an observer.
template
class MeshTraversalSequencer : public PointsSequencer {
public:
diff --git a/contrib/draco/src/draco/compression/point_cloud/algorithms/dynamic_integer_points_kd_tree_decoder.h b/contrib/draco/src/draco/compression/point_cloud/algorithms/dynamic_integer_points_kd_tree_decoder.h
index 87bc2b7ef..55bafe7c4 100644
--- a/contrib/draco/src/draco/compression/point_cloud/algorithms/dynamic_integer_points_kd_tree_decoder.h
+++ b/contrib/draco/src/draco/compression/point_cloud/algorithms/dynamic_integer_points_kd_tree_decoder.h
@@ -18,8 +18,10 @@
#define DRACO_COMPRESSION_POINT_CLOUD_ALGORITHMS_DYNAMIC_INTEGER_POINTS_KD_TREE_DECODER_H_
#include
+#include
#include
#include
+#include
#include "draco/compression/bit_coders/adaptive_rans_bit_decoder.h"
#include "draco/compression/bit_coders/direct_bit_decoder.h"
@@ -92,17 +94,29 @@ class DynamicIntegerPointsKdTreeDecoder {
base_stack_(32 * dimension + 1, VectorUint32(dimension, 0)),
levels_stack_(32 * dimension + 1, VectorUint32(dimension, 0)) {}
- // Decodes a integer point cloud from |buffer|.
+ // Decodes an integer point cloud from |buffer|. Optional |oit_max_points| can
+ // be used to tell the decoder the maximum number of points accepted by the
+ // iterator.
template
bool DecodePoints(DecoderBuffer *buffer, OutputIteratorT &oit);
+ template
+ bool DecodePoints(DecoderBuffer *buffer, OutputIteratorT &oit,
+ uint32_t oit_max_points);
+
#ifndef DRACO_OLD_GCC
template
bool DecodePoints(DecoderBuffer *buffer, OutputIteratorT &&oit);
+ template
+ bool DecodePoints(DecoderBuffer *buffer, OutputIteratorT &&oit,
+ uint32_t oit_max_points);
#endif // DRACO_OLD_GCC
const uint32_t dimension() const { return dimension_; }
+ // Returns the number of decoded points. Must be called after DecodePoints().
+ uint32_t num_decoded_points() const { return num_decoded_points_; }
+
private:
uint32_t GetAxis(uint32_t num_remaining_points, const VectorUint32 &levels,
uint32_t last_axis);
@@ -146,8 +160,15 @@ template
template
bool DynamicIntegerPointsKdTreeDecoder::DecodePoints(
DecoderBuffer *buffer, OutputIteratorT &&oit) {
+ return DecodePoints(buffer, oit, std::numeric_limits::max());
+}
+
+template
+template
+bool DynamicIntegerPointsKdTreeDecoder::DecodePoints(
+ DecoderBuffer *buffer, OutputIteratorT &&oit, uint32_t oit_max_points) {
OutputIteratorT local = std::forward(oit);
- return DecodePoints(buffer, local);
+ return DecodePoints(buffer, local, oit_max_points);
}
#endif // DRACO_OLD_GCC
@@ -155,6 +176,13 @@ template
template