Merge pull request #25 from frenchdog/feature/BIFROST-10035/update-to…

…-bifrost-2.10

BIFROST-9342 - Bifrost for Bifrost 2.10 release

CHANGELOG.md

@@ -1,3 +1,53 @@
+## [1.2.3] - 2024-04-17 (Bifrost 2.10)
+
+### Build
+ - BIFROST-9342 - Update to Bifrost 2.10 SDK. BifrostHd::Container is now managed by Workspace.
+
+
+### Feature
+ - BIFROST-9565 - Add nested Variant Sets support.
+
+    Allow to create a VariantSet inside an existing VariantSet on its prim.
+    It changes the _set_variant_selection_ operator behavior.
+    Previously the "clear" parameter was used to mimic a clear variant set.
+    In the new implementation, the "clear" parameter clear the current variant
+    selection and add a new one in current VariantSet.
+    To only clear the variant selection without setting a new one, use the
+    _clear_variant_selection_ operator.
+
+    This change allow users to create a variant set and a variant by just specifying it in the Variant Selection section of the _define_usd_prim_.
+    Creating a _define_usd_variant_set_ on the parent prim is needed only to set the variant selection in a particular variant set.
+
+ - BIFROST-9637 - Add clear_variant_selection operator.
+ - BIFROST-9638 - Add "Variant Selection" group in _define_usd_curves_ and _define_usd_point_instancer_ compounds.
+ - BIFROST-9611 - Add _get_prim_kind_ operator.
+ - BIFROST-8154 - Add _get_prim_attribute_type_ operator.
+ - BIFROST-8099 - Add _get_applied_schemas_ operator.
+ - BIFROST-9186 - Add _applied_schema_names_ parameter to the _define_usd_prim_ compound.
+    You can pass coma-separated names of USD Applied API Schemas.
+ - BIFROST-9674 - Add _define_usd_geom_subset_ compound.
+ - BIFROST-9686 - Add UI logic on _define_usd_mesh_ to disable "Subdiv" when "Normal Per Vertex" is enabled.
+ - BIFROST-9673 - Add USD graphs and scenes to Bifrost Browser.
+ - BIFROST-9770 - Add the "Bifrost USD Examples" plugin for Maya showing how Bifrost USD can be used to create high level workflows like:
+     - Creating a Bifrost graph dedicated to USD workflows.
+     - Importing a Maya hierachy in a Bifrost Graph as USD prims.
+     - Creating a USD variant from a Maya hierarchy.
+     - Creating a USD Model Component with variants from multiple USD files.
+
+    In the install folder of the project, you will find the _bifrostUSDExamples.mod_ file in "examples/maya_plugin".
+    You will need to add its directory path to your _MAYA_MODULE_PATH_ environment variable. An easy way is by editing the Maya.env file in your user preferences as bellow:
+
+    `MAYA_MODULE_PATH=<your Bifrost USD install path>\examples\maya_plugin`
+
+
+### Bugfix
+ - BIFROST-9608 - Fix wrong parameters layout order in the Variant Selection group.
+
+    The _variant_set_name_ and _variant_name_ parameters order is changed in the _define_usd_prim_ and _define_usd_mesh_ compounds.
+
+ - BIFROST-9056 - Collapse ports grouping on the _define_usd_prim_attribute_ compound.
+ - BIFROST-9334 - Remove compound duplicate in _save_usd_stage.json_ file.
+
 ## [1.2.2] - 2024-03-27 (Bifrost 2.9)
 
 ### Build
@@ -125,7 +175,7 @@
     - _define_usd_transform_
     - _duplicate_usd_prim_definition_
 
- - BIFROST-8319 - Add _get_authored_attribute_names_ node, to get all authored attributes names 
+ - BIFROST-8319 - Add _get_authored_attribute_names_ node, to get all authored attributes names
 
  - BIFROST-8100 - Add _get_all_attribute_names_ node, to get all prim attributes names
 
@@ -134,9 +184,9 @@
  - BIFROST-8426 - Inconsistent UI in define_usd_prim
 
  - BIFROST-8273 - fix sublayers not saved if relative_path is on
-	- Use the layer's save file path (m_filePath) instead of the sdfLayerIdentifier in the recursive call to Layer::exportToFile().
-	- Add new more complete unit test for export_layer_to_file() that covers multiple cases for relative and absolute paths to sublayers.
-	- removed call to changeDir() that has side effect and is not required anymore for unit tests.
+   - Use the layer's save file path (m_filePath) instead of the sdfLayerIdentifier in the recursive call to Layer::exportToFile().
+   - Add new more complete unit test for export_layer_to_file() that covers multiple cases for relative and absolute paths to sublayers.
+   - removed call to changeDir() that has side effect and is not required anymore for unit tests.
 
 
 ## [1.1.0] - 2023-03-29 (Bifrost 2.7)
@@ -154,12 +204,12 @@
 ### Feature
 
 - BIFROST-7955 - Add applied schema nodes
-	- add_applied_schema: This node adds the applied API schema name to the apiSchema metadata of the prim
-	- remove_applied_schema: This node removes the applied API schema name from the apiSchema metadata of the prim
+   - add_applied_schema: This node adds the applied API schema name to the apiSchema metadata of the prim
+   - remove_applied_schema: This node removes the applied API schema name from the apiSchema metadata of the prim
 
 
 ### Bugfix
 
 ## [1.0.0] - 2022-12-12 (Bifrost 2.6)
 
- - Initial release
+ - Initial release

CMakeLists.txt

@@ -1,6 +1,6 @@
 #-
 #*****************************************************************************
-# Copyright 2023 Autodesk, Inc.
+# Copyright 2024 Autodesk, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -204,6 +204,15 @@ if( BIFUSD_BUILD_HYDRA )
     add_subdirectory(bifrost_hydra)
 endif()
 
+#==============================================================================
+# Bifrost USD Examples
+#==============================================================================
+option(BIFUSD_EXAMPLES "Install the examples" ON)
+option(BIFUSD_EXAMPLES_TESTS "Test the examples" OFF)
+if( BIFUSD_EXAMPLES )
+    add_subdirectory(examples)
+endif()
+
 #==============================================================================
 # Configure "clang_tidy" target
 #==============================================================================

README.md

@@ -24,6 +24,10 @@ You must provide the following variables to the cmake command:
 * BIFUSD_OSX_ACTIVE_SDK : (optional) Can be set to choose a specific macOS SDK. If not set, the currently available SDK will be used.
 * BIFUSD_OSX_MIN_OS : (optional) Can be set to choose the minimum macOS deployement target. If not set, macOS 11.0 will be used.
 * BIFUSD_OSX_BINARY_ARCH : (optional) Can be set to choose the target architecture to build on macOS. Acceptable values are `x64` (Intel CPU), `arm64` (Apple M1 CPU), `ub2` (Universal Binary 2 - both x64 and arm64) and empty (default) (host system's processor).
+* BIFUSD_EXAMPLES : (optional) Install the examples. ON by default. Set it to OFF if you don't want to install the extra compounds packs and Maya plugin.
+* BIFUSD_EXAMPLES_TESTS: (optional) Creates the examples tests. OFF by default (requires MAYA_USD_PLUGIN_DIR and LOOKDEVX_PLUGIN_DIR).
+* MAYA_USD_PLUGIN_DIR: (optional) Root directory of the Maya USD plugin where the mayaUSD.mod file is located. Only required to run examples tests.
+* LOOKDEVX_PLUGIN_DIR: (optional) Root directory of the LookdevX plugin where the lookdevx.mod file is located. Only required to run examples tests.
 
 __C++17 is the minimal required version going forward.__
 

bifrost_hydra/CMakeLists.txt

@@ -1,6 +1,6 @@
 #-
 #*****************************************************************************
-# Copyright 2023 Autodesk, Inc.
+# Copyright 2024 Autodesk, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 #+
 
 if(IS_BIFUSD_STANDALONE)
-    include(${BIFROST_LOCATION}/sdk_preview/cmake/setup.cmake)
+    include(${BIFROST_LOCATION}/sdk/cmake/setup.cmake)
 endif()
-find_package(BifrostPreview REQUIRED SDK)
+find_package(Bifrost REQUIRED SDK)
 
 add_subdirectory(src)
 add_subdirectory(test)

bifrost_hydra/src/BifrostHdEngine/CMakeLists.txt

@@ -1,6 +1,6 @@
 #-
 #*****************************************************************************
-# Copyright 2023 Autodesk, Inc.
+# Copyright 2024 Autodesk, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,13 +17,10 @@
 #+
 
 set(hd_Engine_headers
-    Container.h
     Engine.h
     Export.h
     JobTranslationData.h
     Parameters.h
-    Requirement.h
-    Runtime.h
     ValueTranslationData.h
     Workspace.h
 )
@@ -36,8 +33,7 @@ bifusd_install_headers(
 )
 
 set(public_libs
-    Amino::SDK::Preview
-    BifrostGraph::Executor::Preview
+    BifrostGraph::Executor
     hdEngineHeadersInstall
 )
 
@@ -49,12 +45,9 @@ set(private_libs
 )
 
 set(src_files
-    Container.cpp
     Engine.cpp
     JobTranslationData.cpp
     Parameters.cpp
-    Requirement.cpp
-    Runtime.cpp
     ValueTranslationData.cpp
     Workspace.cpp
 )