Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAYA-122528 - MayaUSD should support UFE lights #2266

Merged
merged 11 commits into from
Apr 22, 2022
Merged

MAYA-122528 - MayaUSD should support UFE lights #2266

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0552161
UFE Light support
vlasovi Apr 6, 2022
9bbebe8
- Adding autotests
vlasovi Apr 7, 2022
d78ab17
clang-format
vlasovi Apr 7, 2022
a971c83
Conditional compilation of the feature based on UFE V4 support
vlasovi Apr 7, 2022
7fbcbb7
Merge branch 'public_dev' into vlasovi/MAYA-122528
vlasovi Apr 7, 2022
95e5b68
Merge remote-tracking branch 'public/dev' into vlasovi/MAYA-122528
vlasovi Apr 7, 2022
6a45d40
Fixing the build after the merge
vlasovi Apr 7, 2022
9875c1a
Cover all light types with autotests
vlasovi Apr 11, 2022
2940d90
Additional checks for UFE_PREVIEW_VERSION_NUM to fix the build
vlasovi Apr 11, 2022
48f8842
Fixes after the code review
vlasovi Apr 20, 2022
d527ebe
clang-format
vlasovi Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions lib/mayaUsd/ufe/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@ if(CMAKE_UFE_V3_FEATURES_AVAILABLE)
endif()

if(CMAKE_UFE_V4_FEATURES_AVAILABLE)
if (${UFE_PREVIEW_VERSION_NUM} GREATER_EQUAL 4004)
target_sources(${PROJECT_NAME}
PRIVATE
UsdLight.cpp
UsdLightHandler.cpp
)
endif()

if (${UFE_PREVIEW_VERSION_NUM} GREATER_EQUAL 4001)
target_sources(${PROJECT_NAME}
PRIVATE
Expand Down Expand Up @@ -165,6 +173,13 @@ if(CMAKE_UFE_V3_FEATURES_AVAILABLE)
endif()

if(CMAKE_UFE_V4_FEATURES_AVAILABLE)
if (${UFE_PREVIEW_VERSION_NUM} GREATER_EQUAL 4004)
list(APPEND HEADERS
UsdLight.h
UsdLightHandler.h
)
endif()

if (${UFE_PREVIEW_VERSION_NUM} GREATER_EQUAL 4001)
list(APPEND HEADERS
UsdShaderNodeDef.h
Expand Down
7 changes: 6 additions & 1 deletion lib/mayaUsd/ufe/Global.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
#include <mayaUsd/ufe/UsdPathMappingHandler.h>
#endif
#ifdef UFE_V4_FEATURES_AVAILABLE
#if (UFE_PREVIEW_VERSION_NUM >= 4004)
#include <mayaUsd/ufe/UsdLightHandler.h>
#endif
#if (UFE_PREVIEW_VERSION_NUM >= 4001)
#include <mayaUsd/ufe/UsdShaderNodeDefHandler.h>
#endif
Expand Down Expand Up @@ -158,8 +161,10 @@ MStatus initialize()
handlers.uiInfoHandler = UsdUIInfoHandler::create();
handlers.cameraHandler = UsdCameraHandler::create();
#ifdef UFE_V4_FEATURES_AVAILABLE
#if (UFE_PREVIEW_VERSION_NUM >= 4004)
handlers.lightHandler = UsdLightHandler::create();
#endif
#if (UFE_PREVIEW_VERSION_NUM >= 4001)

handlers.nodeDefHandler = UsdShaderNodeDefHandler::create();
#endif
#endif
Expand Down
Loading