Merge branch 'dev'

rodeofx · Sep 25, 2018 · 6116fbe · 6116fbe
2 parents 739f280 + e4434d5
commit 6116fbe
Show file tree

Hide file tree

Showing 25 changed files with 439 additions and 833 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 build
-
 # Maya
 *.mayaSwatches
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,43 @@
+# Change Log
+
+## [1.2.0] - 2018-09-25
+
+### Added
+- Build system: Added option in vfx_platform_builder script to disable 
+  requirement for Houdini or Katana plugins.
+- Katana: Handle USD purposes in KatanaPlugin.
+  "guide" and "proxy" are viewed in the viewport but not in renderer.
+  "render" is viewed everywhere (viewport and render).
+- Katana: Handle USD Lights.
+  All lights are scanned and put into a lightList at /root/world in Katana
+  to ensure the renderer find them. Since UsdLuxLight is not a concrete schema, 
+  we made an ArnoldLight that inherits from UsdLuxLight and allow us to have generic 
+  ArnoldLight into USD scene.
+- Maya: Variants support in the Walter outliner.
+- Arnold: primvar support for Usd PointInstancer
+
+### Fixed
+- Arnold: Texture coords stretching issue resolved.
+- Katana: crash when scene graph is evaluated and layers are changed.
+- Build system: The 'debug' flag is now propagated to every dependencies
+
+### Removed
+- Arnold: Version 4 is not supported anymore.
+- MtoA Extension: jsoncpp dependency not needed anymore.
+
+## [1.1.0] - 2018-08-30
+
+### Added
+- Katana: USD PointInstancer support using an procedural location.
+
+### Removed
+- MtoA Extension: jsoncpp dependency not needed anymore.
+
+## [1.0.1] - 2018-08-09
+
+### Changed
+- New Walter icons in Maya and Houdini.
+
+## [1.0.0] - 2018-08-08
+
+Initial release
diff --git a/Makefile b/Makefile
@@ -15,7 +15,15 @@
 # Set environment variables for the build.
 
 # 'Release' or 'Debug'
-BUILD_CONFIG := Release
+
+MAKE_MODE := release
+ifeq "$(MAKE_MODE)" "debug"
+CMAKE_BUILD_TYPE := Debug
+else
+CMAKE_BUILD_TYPE := Release
+endif
+
+
 VERBOSE := 1
 BUILD_TESTS := ON
 BUILD_HOUDINI_PLUGINS := ON
@@ -186,7 +194,7 @@ $(WALTER_DCC_STAMP) : $(USD_DCC_STAMP) $(JSONCPP_STAMP) $(GOOGLETEST_STAMP) $(OP
 	-DBUILD_TESTS=$(BUILD_TESTS) \
 	-DBUILD_VIEWER=$(BUILD_VIEWER) \
 	-DBoost_NAMESPACE=$(BOOST_NAMESPACE) \
-	-DCMAKE_BUILD_TYPE=$(BUILD_CONFIG) \
+	-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
 	-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
 	-DCMAKE_INSTALL_PREFIX=$(PREFIX_ROOT)/walter \
 	-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-undefined \
@@ -229,7 +237,7 @@ $(WALTER_DCC_STAMP) : $(USD_DCC_STAMP) $(JSONCPP_STAMP) $(GOOGLETEST_STAMP) $(OP
 	-DUSE_STATIC_HDF5=ON \
 	-DZLIB_ROOT=$(PREFIX_ROOT)/zlib \
 	$(THIS_DIR)/walter && \
-	$(CMAKE) --build . --target install --config $(BUILD_CONFIG) -- -j$(JOB_COUNT) && \
+	$(CMAKE) --build . --target install --config $(CMAKE_BUILD_TYPE) -- -j$(JOB_COUNT) && \
 	echo timestamp > $(WALTER_DCC_STAMP)
 
 # fast build rule for target.
@@ -260,7 +268,7 @@ $(WALTER_PROCEDURAL_STAMP) : $(USD_PROCEDURAL_STAMP) $(JSONCPP_STAMP) $(OPENVDB_
 	-DBUILD_MAYA_PLUGINS=OFF \
 	-DBUILD_TESTS=ON \
 	-DBoost_NAMESPACE=$(BOOST_NAMESPACE) \
-	-DCMAKE_BUILD_TYPE=$(BUILD_CONFIG) \
+	-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
 	-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
 	-DCMAKE_INSTALL_PREFIX=$(PREFIX_ROOT)/walter \
 	-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-undefined \
@@ -303,7 +311,7 @@ $(WALTER_PROCEDURAL_STAMP) : $(USD_PROCEDURAL_STAMP) $(JSONCPP_STAMP) $(OPENVDB_
 	-DUSE_STATIC_HDF5=ON \
 	-DZLIB_ROOT=$(PREFIX_ROOT)/zlib \
 	$(THIS_DIR)/walter && \
-	$(CMAKE) --build . --target install --config $(BUILD_CONFIG) -- -j$(JOB_COUNT)
+	$(CMAKE) --build . --target install --config $(CMAKE_BUILD_TYPE) -- -j$(JOB_COUNT)
 	echo timestamp > $(WALTER_PROCEDURAL_STAMP)
 
 # fast build rule for target.
@@ -325,6 +333,7 @@ vfx_builder = \
 	echo "Building" $(1) "for Walter" && \
 	cd $(THIS_DIR)/vfx_platform_builder && \
 	make CC=$(GCC_BIN_PATH)/gcc CXX=$(GCC_BIN_PATH)/g++ \
+	MAKE_MODE=$(MAKE_MODE) \
 	USD_PACKAGE_NAME=$(2) \
 	BOOST_NAMESPACE=$(3) \
 	TBB_NAMESPACE=$(4) \
@@ -345,11 +354,11 @@ help:
 	printf '\tlibXxf86vm-devel libXrandr-devel libXinerama-devel\n' ; \
 	printf '\tlibXcursor-devel libXi-devel libXt-devel\n\n' ; \
 	printf 'Usage to build all (VFX Platform, Walter for Katana, Houdini, Maya and Arnold):\n' ; \
-	printf '\tmake\nor\n\tmake BUILD_CONFIG=Debug\n\n' ; \
+	printf '\tmake\nor\n\tmake MAKE_MODE=debug\n\n' ; \
 	printf 'Options:\n' ; \
 	printf '\tCC\t\t: C copiler path.\t value: $(CC)\n' ; \
 	printf '\tCXX\t\t: C++ copiler path.\t value: $(CXX)\n' ; \
-	printf '\tBUILD_CONFIG\t: Debug|Release.\t value: $(BUILD_CONFIG)\n' ; \
+	printf '\tMAKE_MODE\t: debug|release.\t value: $(MAKE_MODE)\n' ; \
 	printf '\tSOURCES_ROOT\t: Source directory.\t value: $(SOURCES_ROOT)\n' ; \
 	printf '\tBUILD_ROOT\t: Building directory.\t value: $(BUILD_ROOT)\n' ; \
 	printf '\tPREFIX_ROOT\t: Installation dir.\t value: $(PREFIX_ROOT)\n' ; \

diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 ![Open Walter](https://www.rodeofx.com/uploads/images/tech/Walter_logo_mini-01.png)
 
+[![Join the chat at https://gitter.im/OpenWalter/Lobby](https://badges.gitter.im/OpenWalter/Lobby.svg)](https://gitter.im/OpenWalter/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Walter is suite of plugins using USD for various DCCs and renderer.
 
 It's main goal is to stay as much as possible in the [*USD Stage*](http://graphics.pixar.com/usd/docs/USD-Glossary.html#USDGlossary-Stage) 
@@ -41,7 +43,7 @@ The following versions were used in production.
 
 | Application     | Version   |
 | ----------------| --------- |
-| Arnold          | 4.2.16.2, 5.0.2.4, 5.1.1.1 |
+| Arnold          | 5.0.2.4, 5.1.1.1 |
 | Houdini         | 16.5.350, 16.5.496 |
 | Katana          | 2.5v7, 3.0.2 |
 | Maya            | 2016SP4, 2018.3 |
@@ -103,7 +105,7 @@ You must set the Arnold root path in your environment.
 
 | Variable Name     | Description                                                                                     | Version   |
 | ----------------- | -----------------------------------                                                             | --------- |
-| ARNOLD_ROOT       | The root path to Arnold install                                                                 | 4.2.16.2 5.0.2.4 5.1.1.1 |
+| ARNOLD_ROOT       | The root path to Arnold install                                                                 | 5.0.2.4 5.1.1.1 |
 
 
 ##### Houdini Plugin
@@ -121,7 +123,7 @@ You must set the Houdini and HtoA root paths in your environment.
 | Variable Name     | Description                                                                                     | Version   |
 | ----------------- | -----------------------------------                                                             | --------- |
 | HOUDINI_ROOT      | The root path to Houdini install                                                                | 16.5.350 16.5.496 |
-| HTOA_ROOT         | The root path to HtoA install                                                                   | 2.2.4  3.0.3 |
+| HTOA_ROOT         | The root path to HtoA install                                                                   | 3.0.3 |
 
 
 ##### Katana Plugin
@@ -135,7 +137,7 @@ You must set the Maya and MtoA root paths in your environment.
 | Variable Name     | Description                                                                                     | Version   |
 | ----------------- | -----------------------------------                                                             | --------- |
 | KATANA_ROOT       | The root path to Katana install                                                                 | 2.5v7 3.0.2 |
-| KTOA_ROOT         | The root path to KtoA install                                                                   | 2.0.4.0 2.0.8.0 2.1.2.0 |
+| KTOA_ROOT         | The root path to KtoA install                                                                   | 2.1.2.0 |
 
 ##### Maya Plugin
 
@@ -171,7 +173,7 @@ You must set the Maya and MtoA install paths in your environment.
 | Variable Name     | Description                                                                                     | Version   |
 | ----------------- | -----------------------------------                                                             | --------- |
 | MAYA_ROOT         | The root path to Maya install                                                                   | 2016SP4 2018.3 |
-| MTOA_ROOT         | The root path to MtoA install                                                                   | 1.4.2  2.0.2.2 3.0.1.1 |
+| MTOA_ROOT         | The root path to MtoA install                                                                   | 3.0.1.1 |
 
 For example:
 ```

diff --git a/vfx_platform_builder/Makefile b/vfx_platform_builder/Makefile
@@ -1820,6 +1820,7 @@ $(USD_STAMP) : $(ALEMBIC_STAMP) $(BOOST_STAMP) $(CMAKE_STAMP) $(DC_STAMP) $(EMBR
 	( git am $(THIS_DIR)/patches/USD/0018-RDO-the-ability-to-reference-a-root.patch ) && \
 	( git am $(THIS_DIR)/patches/USD/0019-RDO-USD-AlembicReader-Suppress-warnings.patch ) && \
 	( git am $(THIS_DIR)/patches/USD/0020-RDO-hdEngine-v0.8.5-broke-our-hdEmbree-plugin-when-used-.patch ) && \
+	( git am $(THIS_DIR)/patches/USD/0021-RDO-USD-Alembic-Fixed-texture-stretching-artifacts.patch ) && \
 	( printf "/find_library.*OPENEXR_.*_LIBRARY/a\nNAMES\n\044{OPENEXR_LIB}-2_2\n.\nw\nq" | ed -s cmake/modules/FindOpenEXR.cmake ) && \
 	( printf "/PATH_SUFFIXES/-a\n\"\044{OPENEXR_BASE_DIR}\"\n.\nw\nq" | ed -s cmake/modules/FindOpenEXR.cmake ) && \
 	( printf "/^namespace boost/s/namespace boost/namespace ${BOOST_NAMESPACE}/\nw\nq" | ed -s pxr/base/lib/tf/weakPtrFacade.h ) && \
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     build
     # Maya
     *.mayaSwatches
@@ Expand Down @@