Merge branch 'main' into fix-javascript-example

Author: jokester

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/docs"
+    schedule:
+      interval: "monthly"
+    groups:
+      doc-gems-security:
+        applies-to: "security-updates"
+        patterns:
+          - "*"
+    commit-message:
+      include: "scope"

.github/workflows/ci.yml

@@ -3,9 +3,9 @@ on:
   # Run on all pull requests.
 
   push:
-    # Run on merges/pushes to master.
+    # Run on merges/pushes to main.
     branches:
-      - master
+      - main
 
   schedule:
     # Run nightly, at midnight.

CMakeLists.txt

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

README.md

@@ -2,7 +2,7 @@
 <img width="350px" src="docs/artwork/draco3d-vert.svg" />
 </p>
 
-[![draco-ci](https://github.com/google/draco/workflows/draco-ci/badge.svg?branch=master)](https://github.com/google/draco/actions/workflows/ci.yml)
+[![draco-ci](https://github.com/google/draco/workflows/draco-ci/badge.svg?branch=main)](https://github.com/google/draco/actions/workflows/ci.yml)
 
 News
 =======
@@ -14,6 +14,14 @@ delays can result in transient errors that can be difficult to diagnose when
 new Draco releases are launched. To avoid the issue pin your sites to a
 versioned release.
 
+### Version 1.5.7 release:
+* Using the versioned www.gstatic.com WASM and Javascript decoders continues
+  to be recommended. To use v1.5.7, use this URL:
+  * https://www.gstatic.com/draco/versioned/decoders/1.5.7/*
+* Added support for normalized attributes to Emscripten encoder API.
+* Bug fixes.
+* Security fixes.
+
 ### Version 1.5.6 release:
 * Using the versioned www.gstatic.com WASM and Javascript decoders continues
   to be recommended. To use v1.5.6, use this URL:
@@ -603,6 +611,6 @@ References
 [meshes]: https://en.wikipedia.org/wiki/Polygon_mesh
 [point clouds]: https://en.wikipedia.org/wiki/Point_cloud
 [Bunny]: https://graphics.stanford.edu/data/3Dscanrep/
-[CONTRIBUTING]: https://raw.githubusercontent.com/google/draco/master/CONTRIBUTING.md
+[CONTRIBUTING]: https://raw.githubusercontent.com/google/draco/main/CONTRIBUTING.md
 
 Bunny model from Stanford's graphic department <https://graphics.stanford.edu/data/3Dscanrep/>

cmake/draco_build_definitions.cmake

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

cmake/draco_install.cmake

@@ -23,99 +23,101 @@ include(GNUInstallDirs)
 # Sets up the draco install targets. Must be called after the static library
 # target is created.
 macro(draco_setup_install_target)
-  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$")
-      list(APPEND draco_api_includes ${file})
+  if(DRACO_INSTALL)
+    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$")
+        list(APPEND draco_api_includes ${file})
+      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}/" "")
+
+    foreach(draco_api_include ${draco_api_includes})
+      get_filename_component(file_directory ${draco_api_include} 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 "${includes_path}/draco/")
+
+    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()
-  endforeach()
 
-  list(REMOVE_DUPLICATES draco_api_includes)
+    if(MSVC)
+      install(
+        TARGETS draco
+        EXPORT dracoExport
+        RUNTIME DESTINATION "${bin_path}"
+        ARCHIVE DESTINATION "${libs_path}"
+        LIBRARY DESTINATION "${libs_path}")
+    else()
+      install(
+        TARGETS draco_static
+        EXPORT dracoExport
+        DESTINATION "${libs_path}")
+
+      if(BUILD_SHARED_LIBS)
+        install(
+          TARGETS draco_shared
+          EXPORT dracoExport
+          RUNTIME DESTINATION "${bin_path}"
+          ARCHIVE DESTINATION "${libs_path}"
+          LIBRARY DESTINATION "${libs_path}")
+      endif()
+    endif()
 
-  # 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}/" "")
+    if(DRACO_UNITY_PLUGIN)
+      install(TARGETS dracodec_unity DESTINATION "${libs_path}")
+    endif()
 
-  foreach(draco_api_include ${draco_api_includes})
-    get_filename_component(file_directory ${draco_api_include} DIRECTORY)
-    set(target_directory "${includes_path}/draco/${file_directory}")
-    install(FILES ${draco_src_root}/${draco_api_include}
-            DESTINATION "${target_directory}")
-  endforeach()
+    if(DRACO_MAYA_PLUGIN)
+      install(TARGETS draco_maya_wrapper DESTINATION "${libs_path}")
+    endif()
 
-  install(FILES "${draco_build}/draco/draco_features.h"
-          DESTINATION "${includes_path}/draco/")
+    # 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")
 
-  install(TARGETS draco_decoder DESTINATION "${bin_path}")
-  install(TARGETS draco_encoder DESTINATION "${bin_path}")
+    # 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")
 
-  if(DRACO_TRANSCODER_SUPPORTED)
-    install(TARGETS draco_transcoder DESTINATION "${bin_path}")
-  endif()
+    write_basic_package_version_file(
+      "${draco_build}/draco-config-version.cmake"
+      VERSION ${DRACO_VERSION}
+      COMPATIBILITY AnyNewerVersion)
 
-  if(MSVC)
-    install(
-      TARGETS draco
+    export(
       EXPORT dracoExport
-      RUNTIME DESTINATION "${bin_path}"
-      ARCHIVE DESTINATION "${libs_path}"
-      LIBRARY DESTINATION "${libs_path}")
-  else()
+      NAMESPACE draco::
+      FILE "${draco_build}/draco-targets.cmake")
+
     install(
-      TARGETS draco_static
       EXPORT dracoExport
-      DESTINATION "${libs_path}")
-
-    if(BUILD_SHARED_LIBS)
-      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 "${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")
+      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")
+  endif(DRACO_INSTALL)
 endmacro()

cmake/draco_options.cmake

@@ -131,6 +131,10 @@ macro(draco_set_default_options)
     NAME DRACO_DEBUG_COMPILER_WARNINGS
     HELPSTRING "Turn on more warnings."
     VALUE OFF)
+  draco_option(
+    NAME DRACO_INSTALL
+    HELPSTRING "Enable installation."
+    VALUE ON)
   draco_check_deprecated_options()
 endmacro()
 

cmake/draco_tests.cmake

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

docs/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.0