Skip to content

Commit bd1e8de

Browse files
authored
Draco v1.5.2 release. (#818)
1 parent 9522c22 commit bd1e8de

23 files changed

+815
-6
lines changed

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ delays can result in transient errors that can be difficult to diagnose when
1414
new Draco releases are launched. To avoid the issue pin your sites to a
1515
versioned release.
1616

17+
### Version 1.5.2 release
18+
* This is the same as v1.5.1 with the following two bug fixes:
19+
* Fixes DRACO_TRANSCODER_SUPPORTED enabled builds.
20+
* ABI version updated.
21+
1722
### Version 1.5.1 release
1823
* Adds assertion enabled Emscripten builds to the release, and a subset of the
1924
assertion enabled builds to GStatic. See the file listing below.

cmake/draco_build_definitions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ macro(draco_set_build_definitions)
6060
# passed to libtool.
6161
#
6262
# We set DRACO_SOVERSION = [c-a].a.r
63-
set(LT_CURRENT 3)
63+
set(LT_CURRENT 4)
6464
set(LT_REVISION 0)
6565
set(LT_AGE 0)
6666
math(EXPR DRACO_SOVERSION_MAJOR "${LT_CURRENT} - ${LT_AGE}")

javascript/npm/draco3d/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
News
77
=======
88

9-
Check out the [README](https://github.com/google/draco/blob/1.5.1/README.md)
9+
Check out the [README](https://github.com/google/draco/blob/1.5.2/README.md)
1010
file for news about this release.
1111

1212
Description

javascript/npm/draco3d/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "draco3d",
3-
"version": "1.5.1",
3+
"version": "1.5.2",
44
"description": "Draco is a library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.",
55
"main": "draco3d.js",
66
"scripts": {

javascript/npm/draco3dgltf/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Draco github glTF branch URL: https://github.com/google/draco/tree/gltf_2.0_drac
2424
News
2525
=======
2626

27-
Check out the [README](https://github.com/google/draco/blob/1.5.1/README.md)
27+
Check out the [README](https://github.com/google/draco/blob/1.5.2/README.md)
2828
file for news about this release.
2929

3030
NPM Package

javascript/npm/draco3dgltf/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "draco3dgltf",
3-
"version": "1.5.1",
3+
"version": "1.5.2",
44
"description": "This package contains a specific version of Draco 3D geometric compression library that is used for glTF Draco mesh compression extension.",
55
"main": "draco3dgltf.js",
66
"scripts": {

maya/draco_maya_wrapper_macos.tar.bz

10 Bytes
Binary file not shown.
-35 Bytes
Binary file not shown.

src/draco/core/draco_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
namespace draco {
1919

2020
// Draco version is comprised of <major>.<minor>.<revision>.
21-
static const char kDracoVersion[] = "1.5.1";
21+
static const char kDracoVersion[] = "1.5.2";
2222

2323
const char *Version() { return kDracoVersion; }
2424

src/draco/texture/texture_utils.cc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,21 @@ std::string TextureUtils::GetExtension(ImageFormat format) {
9999
}
100100
}
101101

102+
int TextureUtils::ComputeRequiredNumChannels(
103+
const Texture &texture, const MaterialLibrary &material_library) {
104+
// TODO(vytyaz): Consider a case where |texture| is not only used in OMR but
105+
// also in other texture map types.
106+
const auto mr_textures = TextureUtils::FindTextures(
107+
TextureMap::METALLIC_ROUGHNESS, &material_library);
108+
if (std::find(mr_textures.begin(), mr_textures.end(), &texture) ==
109+
mr_textures.end()) {
110+
// Occlusion-only texture.
111+
return 1;
112+
}
113+
// Occlusion-metallic-roughness texture.
114+
return 3;
115+
}
116+
102117
std::vector<const Texture *> TextureUtils::FindTextures(
103118
const TextureMap::Type texture_type,
104119
const MaterialLibrary *material_library) {

0 commit comments

Comments
 (0)