Unity related changes

.gitignore

@@ -1 +1,6 @@
 docs/_site
+
+/.vscode
+/build*
+
+.DS_Store

.yamato/environments.metafile

@@ -0,0 +1,44 @@
+log_path: "test_results~"
+
+artifactory_url: "https://artifactory.prd.cds.internal.unity3d.com/artifactory"
+homebrew_url: "[email protected]:unity/homebrew-unity.git"
+
+sonarqube_ci:
+  url: "https://sonarqube.internal.unity3d.com"
+  dependency:
+    name: "com.unity.ide.rider"
+    version: "3.0.13"
+  analysis:
+    - pr
+    - branch
+
+generic_project_path: .yamato/common/test_project~
+player_path: build/player
+
+npm_registry: "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+upm_ci_registry: "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm"
+
+ci:
+  win:
+    env_sonar_token: "!SONARQUBE_PROD_ACCESS_TOKEN!"
+    env_unity_path: "%UNITY_EDITOR_PATH%"
+    env_yamato_src_dir: "%YAMATO_SOURCE_DIR%"
+    tool_utr: "utr.bat"
+  android:
+    env_sonar_token: "!SONARQUBE_PROD_ACCESS_TOKEN!"
+    env_unity_path: "%UNITY_EDITOR_PATH%"
+    env_yamato_src_dir: "%YAMATO_SOURCE_DIR%"
+    tool_utr: "utr.bat"
+  mac:
+    env_sonar_token: "$SONARQUBE_PROD_ACCESS_TOKEN"
+    env_unity_path: "$UNITY_EDITOR_PATH"
+    env_yamato_src_dir: "$YAMATO_SOURCE_DIR"
+    tool_utr: "./utr"
+
+editor_component:
+  android:
+    args: "-c Android"
+  ios:
+    args: "-c iOS"
+
+build_and_run: [ build, run ]

.yamato/project.metafile

@@ -0,0 +1,31 @@
+is_monorepo: !!bool true
+enable_nightly: !!bool true
+using_submodule: !!bool false
+git_main_branch: main
+
+enable_codecov: !!bool false
+enable_sonarqube: !!bool true
+
+upm_test_platforms:
+  - name: win
+    type: Unity::VM
+    flavor: b1.large
+    image: package-ci/win10:v4
+  - name: mac
+    type: Unity::VM::osx
+    image: package-ci/macos-13:v4
+    flavor: m1.mac
+
+web_packages:
+  - name: 2020
+    emscripten_version: 1.38.48-fastcomp
+    unity_version: 2020.3
+  - name: 2021
+    emscripten_version: 2.0.19
+    unity_version: 2021.2
+  - name: 2022
+    emscripten_version: 3.1.8
+    unity_version: 2022.2
+  - name: 2023
+    emscripten_version: 3.1.38
+    unity_version: 2023.2

.yamato/upm-ci.yml

@@ -0,0 +1,166 @@
+{% metadata_file .yamato/environments.metafile %}
+{% metadata_file .yamato/project.metafile  %}
+---
+{% for pkg in web_packages -%}
+{% assign emscripten_version_suffix = pkg.emscripten_version | split: "-" | last %}
+emscripten_{{pkg.name}}:
+  name: "Emscripten {{ pkg.name }}"
+  agent:
+    type: Unity::VM
+    image: package-ci/ubuntu-22.04:v4
+    flavor: b1.small
+  commands:
+
+# TODO: Remove fastcomp support once 2020 is dropped
+{% if emscripten_version_suffix == "fastcomp" %}
+    ## Fastcomp requires legacy version (tag 3.1.29 or sooner; Unity fork latest synced tag is 2.0.18)
+    - git clone -b 2.0.18 --single-branch https://github.com/Unity-Technologies/emsdk.git
+{% else %}
+      # Clone Emscripten
+    - git clone -b 3.1.38-unity --single-branch https://github.com/Unity-Technologies/emsdk.git
+{% endif %}
+
+    # Install and activate correct Emscripten version
+    - |
+      pushd emsdk
+      ./emsdk install {{ pkg.emscripten_version }}
+      ./emsdk activate {{ pkg.emscripten_version }}
+      popd
+
+    # Configure
+{% if emscripten_version_suffix == "fastcomp" %}
+    - |
+      source ./emsdk/emsdk_env.sh
+      emcmake cmake . -B build_web -DEMSCRIPTEN_GENERATE_BITCODE_STATIC_LIBRARIES=1 -DCMAKE_BUILD_TYPE=MinSizeRel -DDRACO_JS_GLUE=OFF -DDRACO_UNITY_PLUGIN=ON -DDRACO_GLTF_BITSTREAM=ON -DDRACO_BACKWARDS_COMPATIBILITY=OFF
+{% else %}
+    - |
+      source ./emsdk/emsdk_env.sh
+      EMSCRIPTEN="$EMSDK/upstream/emscripten" emcmake cmake . -B build_web -DCMAKE_BUILD_TYPE=MinSizeRel -DDRACO_JS_GLUE=OFF -DDRACO_UNITY_PLUGIN=ON -DDRACO_GLTF_BITSTREAM=ON -DDRACO_BACKWARDS_COMPATIBILITY=OFF
+{% endif %}
+
+    # Build
+    - |
+      source ./emsdk/emsdk_env.sh
+      cmake --build build_web --target draco_unity
+
+    # Create and fill results folder
+    - |
+      mkdir -p wasm-binaries~/{{ pkg.name }}
+      mv build_web/libdraco_unity.* wasm-binaries~/{{ pkg.name }}
+
+  artifacts:
+    wasm-binaries:
+      paths:
+        - "wasm-binaries~/**/*"
+{% endfor -%}
+
+{% for pkg in web_packages -%}
+upm_ci_pack_{{pkg.name}}:
+  name: "Pack {{ pkg.name }}"
+  agent:
+    type: Unity::VM
+    image: package-ci/ubuntu-22.04:v4
+    flavor: b1.small
+  commands:
+    # Install upm-ci
+    - npm install upm-ci-utils@stable -g --registry {{upm_ci_registry}}
+
+    # Move binaries into package
+    - mv wasm-binaries~/{{ pkg.name }}/lib*.* UnityPackages/com.unity.cloud.draco.webgl-{{ pkg.name }}/Runtime/Plugins/WebGL
+
+    # Pack
+    - upm-ci package pack --package-path "UnityPackages/com.unity.cloud.draco.webgl-{{ pkg.name }}"
+  dependencies:
+    - .yamato/upm-ci.yml#emscripten_{{pkg.name}}
+  artifacts:
+    packages:
+      paths:
+        - "upm-ci~/packages/**/*"
+{% endfor -%}
+
+{% for pkg in web_packages -%}
+{% for platform in upm_test_platforms -%}
+upm_ci_test_{{pkg.name}}_{{pkg.unity_version}}_{{platform.name}}:
+  name : "Test Editor {{pkg.name}} ({{ pkg.unity_version }}) on {{ platform.name }}"
+  agent:
+    type: {{platform.type}}
+    image: {{platform.image}}
+    flavor: {{platform.flavor}}
+  commands:
+     - npm install upm-ci-utils@stable -g --registry {{upm_ci_registry}}
+     - upm-ci package test --package-path "UnityPackages/com.unity.cloud.draco.webgl-{{ pkg.name }}" -u {{pkg.unity_version}} --type isolation-tests --enable-load-and-test-isolation
+  artifacts:
+    packages:
+      paths:
+        - "upm-ci~/packages/**/*"
+    logs:
+      paths:
+        - "upm-ci~/test-results/**/*"
+  dependencies:
+    - .yamato/upm-ci.yml#upm_ci_pack_{{pkg.name}}
+{% endfor -%}
+{% endfor -%}
+
+{% for pkg in web_packages -%}
+upm_ci_publish_dry_run_{{pkg.name}}:
+  name: "Dry Run Publish {{ pkg.name }}"
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:v4
+    flavor: b1.small
+  commands:
+    - npm install upm-ci-utils@stable -g --registry {{ upm_ci_registry }}
+    # going for dry run until we're ready to do a real publish
+    - upm-ci package publish --package-path "UnityPackages/com.unity.cloud.draco.webgl-{{ pkg.name }}" --dry-run
+  dependencies:
+{% for platform in upm_test_platforms -%}
+    - .yamato/upm-ci.yml#upm_ci_test_{{pkg.name}}_{{pkg.unity_version}}_{{platform.name}}
+{% endfor -%}
+  artifacts:
+    logs_{{pkg.name}}:
+      paths:
+        - "{{ log_path }}/**/*"
+    package:
+      paths:
+        - "upm-ci~/packages/*.tgz"
+{% endfor -%}
+
+
+upm_ci_publish_dry_run:
+  name: "Dry Run Publish"
+  dependencies:
+{% for pkg in web_packages -%}
+    - .yamato/upm-ci.yml#upm_ci_publish_dry_run_{{pkg.name}}
+{% endfor -%}
+
+
+{% for pkg in web_packages -%}
+upm_ci_publish_{{pkg.name}}:
+  name: "Publish to Internal Registry {{ pkg.name }}"
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:v4
+    flavor: b1.small
+  commands:
+    - npm install upm-ci-utils@stable -g --registry {{ upm_ci_registry }}
+    # going for dry run until we're ready to do a real publish
+    - upm-ci package publish --package-path "UnityPackages/com.unity.cloud.draco.webgl-{{ pkg.name }}"
+  dependencies:
+{% for platform in upm_test_platforms -%}
+    - .yamato/upm-ci.yml#upm_ci_test_{{pkg.name}}_{{pkg.unity_version}}_{{platform.name}}
+{% endfor -%}
+  artifacts:
+    logs_{{pkg.name}}:
+      paths:
+        - "{{ log_path }}/**/*"
+    package:
+      paths:
+        - "upm-ci~/packages/*.tgz"
+{% endfor -%}
+
+upm_ci_publish:
+  name: "Publish to Internal Registry"
+  dependencies:
+{% for pkg in web_packages -%}
+    - .yamato/upm-ci.yml#upm_ci_publish_{{pkg.name}}
+{% endfor -%}

CMakeLists.txt

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 project(draco C CXX)
 
 if(NOT CMAKE_BUILD_TYPE)
@@ -533,6 +533,10 @@ list(APPEND draco_unity_plug_sources
             "${draco_src_root}/unity/draco_unity_plugin.cc"
             "${draco_src_root}/unity/draco_unity_plugin.h")
 
+list(APPEND draco_unity_enc_plug_sources
+            "${draco_src_root}/unity/draco_unity_enc_plugin.cc"
+            "${draco_src_root}/unity/draco_unity_enc_plugin.h")
+
 list(APPEND draco_maya_plug_sources
             "${draco_src_root}/maya/draco_maya_plugin.cc"
             "${draco_src_root}/maya/draco_maya_plugin.h")
@@ -1049,12 +1053,43 @@ else()
   endif()
 
   if(DRACO_UNITY_PLUGIN)
-    if(IOS)
+    if(IOS OR EMSCRIPTEN OR CMAKE_SYSTEM_NAME STREQUAL "tvOS")
       set(unity_decoder_lib_type STATIC)
+    elseif(CMAKE_SYSTEM_NAME STREQUAL "visionOS")
+      set(unity_decoder_lib_type SHARED)
     else()
       set(unity_decoder_lib_type MODULE)
     endif()
 
+    set(unity_objlib_dependency draco_unity_plugin)
+
+    list(APPEND unity_objlib_dependency
+      # Link selected object libs directly instead of ${draco_plugin_dependency}
+      # minimizes build size by omitting animation/IO/transcoder related symbols
+      # results in a single static lib file (no dependency on target `draco`)
+      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_mesh
+      draco_metadata
+      draco_metadata_dec
+      draco_metadata_enc
+      draco_point_cloud
+      draco_points_dec
+      draco_points_enc
+    )
+
     draco_add_library(
       NAME draco_unity_plugin
       TYPE OBJECT
@@ -1063,16 +1098,23 @@ else()
       INCLUDES ${draco_include_paths})
 
     draco_add_library(
-      NAME dracodec_unity
+      NAME draco_unity_enc_plugin
+      TYPE OBJECT
+      SOURCES ${draco_unity_enc_plug_sources}
+      DEFINES ${draco_defines}
+      INCLUDES ${draco_include_paths})
+
+    draco_add_library(
+      NAME draco_unity
       TYPE ${unity_decoder_lib_type}
       DEFINES ${draco_defines}
       INCLUDES ${draco_include_paths}
-      OBJLIB_DEPS draco_unity_plugin
-      LIB_DEPS ${draco_plugin_dependency})
+      OBJLIB_DEPS ${unity_objlib_dependency} draco_unity_enc_plugin
+    )
 
-    # For Mac, we need to build a .bundle for the unity plugin.
-    if(APPLE)
-      set_target_properties(dracodec_unity PROPERTIES BUNDLE true)
+    # For macOS, we need to build a .bundle for the unity plugin.
+    if(APPLE AND CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+      set_target_properties(draco_unity PROPERTIES BUNDLE true)
     endif()
   endif()
 

UnityPackages/com.unity.cloud.draco.webgl-2020/CHANGELOG.md

@@ -0,0 +1,31 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.0.0] - 2023-12-15
+
+### Fixed
+
+- Added copy of license to `Third Party Notices.md`
+
+## [1.0.0-pre.2] - 2023-11-13
+
+### Added
+
+- Empty runtime tests
+
+### Changed
+
+- Increased minimum required version to Unity 2020.3
+
+### Fixed
+
+- Removed warning about missing main package when it was installed as indirect dependency
+- Correct namespace for Editor tests
+
+## [1.0.0-pre.1] - 2023-11-03
+
+Initial sub package publication