Skip to content

Commit

Permalink
Squashing 'dev-adsk' branch for merge to develop
Browse files Browse the repository at this point in the history
1. glext.h is not in the devkit anymore, switching files

2. Adding chrono for windows only

3. Adding python libraries to fix link issue

4. MAYA-xxxx Integrating UFE into AL_USDMaya plugin
- Integration of the UFE libraries include cmake lookup and cmake on/off
  variables to enable and disable compilation with UFE
- Integration of a runtime variable to switch on/off UFE selection with
  the plugin
- Integrate UFE selection and disabling creation of proxy nodes for usd
   prim selections

5. Updating runtime id, separator of USD, and adding an added header in the want ufe build ompile

6. Missing header file

7. Merging 0.28.5 into dev-adsk (AnimalLogic#9)

8. Windows build fixes: (AnimalLogic#10)
* Remove treat warnings as errors (/WX)
* Multiline (with \) the C++ options

9. Show the UFE selection in the viewport (AnimalLogic#11)

* Show the UFE selection in the viewport

* When drawing the override, if the env var MAYA_WANT_UFE_SELECTION is
  set get the UFE selection and for the USD items draw them in wireframe
  with the Maya selection color.

* Code review: adding code comments

* Fix spelling mistake

10. Changing PATHS to HINTS in cmake file

11. Windows build fixes (AnimalLogic#13)

* MAYA-93327 - Integrate USD in Maya

* Install the Windows .pdb files.

* Add UFE build define when cmake flag is set.

* Fix relative library path for plugInfo.json files.

* Build schemas/plugInfo.json in binary folder (not source).
  So git status is not dirtied.

* Use UFE_VERSION (instead of hard-coded value) which is set above this
  repo when building.

* When building with UFE, we must have the UFE version defined.

* Code review comments - build ufe major/minor vars in the parent rather
  than child (FindUFE.cmake). This way they are accessible to others.

12. MAYA-93327 - Integrate USD in Maya (AnimalLogic#14)

* RPATH has been deprecated in favor or RUNPATH which is same except
  that it is searched after LD_LIBRARY_PATH. This gives users the ability
  to override the shared libraries.

13. Use local UFE and versioning fix.

14. Convert FindUFE.cmake to LF line endings.

15. Improved USD selection highlighting.

16. MAYA-88299 - Versioning for UFE and API (AnimalLogic#16)

* UFE lib/dll/so/dylib with major only version (no minor).

17. Merging master (0.29.1) into dev-adsk (AnimalLogic#17)

18. MAYA-94776 - Update USD plugin to latest AL branch (AnimalLogic#18)

* Adding missing pdb file for new plugin file.

19. MAYA-94776 - Update 'dev-adsk' to latest 'develop' to get VP2 Selection code (AnimalLogic#19)

20. MAYA-95136 consistent behavior with legacy VP1 selection (AnimalLogic#20)

21. MAYA-94667 deselect USD objs by clicking void area (AnimalLogic#21)

* MAYA-94667 deselect USD objs by clicking void area

* MAYA-94667 code review suggestions

* MAYA-94667 code review suggestion

22. MAYA-95136 selection under complex transform nodes (AnimalLogic#22)

23. MAYA-95391 revert regression change (AnimalLogic#23)

24. MAYA-95391 RMB click shouldn't trigger selection (AnimalLogic#24)

Port the VP1 implementation in ProxyShapeUI::select().

25. MAYA-95322 update bounding box of AL_MayaUSD proxy shape (AnimalLogic#25)

* MAYA-95322 update bounding box of AL_MayaUSD proxy shape

* MAYA-95322 code review feedback

26. Temporary restore alwaysDirty ProxyDrawOrride

(cherry picked from commit 6060036)

MAYA-95165 : Crash when duplicating USD objects

   The regression was introduced by the commit https://git.autodesk.com/autodesk-forks/AL_USDMaya/commit/321be29175a43aa270bb9d50387ac335c0d483d0
   To avoid that problem we cherry-picked the correction from the last
   updates in the develop branch.

27. MAYA-95627 - Update to latest AL develop branch v0.29.4 + USD v18.11

Merge branch 'develop' into donnels/merging_in_develop_0.29.4

28. MAYA-95627 - Update to latest AL develop branch v0.29.4 + USD v18.11

* Fixing merge (of develop branch into dev-adsk) error.

29. MAYA-95627 - Update to latest AL develop branch v0.29.4 + USD v18.11 (AnimalLogic#28)

* Some minor fixes related to merging discovered when trying to merge
  our 'dev-adsk' branch into 'develop'.

30. Comment from initial pull request to AL
  • Loading branch information
dalgos-adsk authored and seando-adsk committed Nov 27, 2018
1 parent d8ea02a commit b23402d
Show file tree
Hide file tree
Showing 21 changed files with 676 additions and 70 deletions.
18 changes: 16 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,22 @@ add_definitions(${_PXR_CXX_DEFINITIONS})

find_package(Maya REQUIRED)

if(CMAKE_WANT_UFE_BUILD)
add_definitions(-DWANT_UFE_BUILD)
message(STATUS "UFE Build Enabled")
if (NOT UFE_VERSION)
message(FATAL_ERROR "UFE_VERSION must be defined when WANT_UFE_BUILD is enabled")
endif()
message(STATUS "Using UFE version : ${UFE_VERSION}")
string(REPLACE "." ";" UFE_VERSION_LIST ${UFE_VERSION})
list(GET UFE_VERSION_LIST 0 UFE_MAJOR_VERSION)
list(GET UFE_VERSION_LIST 1 UFE_MINOR_VERSION)
list(GET UFE_VERSION_LIST 2 UFE_PATCH_LEVEL)
find_package(UFE REQUIRED)
include_directories(${UFE_INCLUDE_DIR})
endif()


include_directories(${MAYA_INCLUDE_DIRS})

include_directories(${PXR_INCLUDE_DIRS})
Expand Down Expand Up @@ -52,8 +68,6 @@ set(NEED_BOOST_FILESYSTEM ON)

if(WIN32)
set(CMAKE_CXX_FLAGS
-std=c++11
/WX
"${_PXR_CXX_FLAGS}"
)
else()
Expand Down
4 changes: 2 additions & 2 deletions cmake/defaults/msvcdefaults.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /EHsc")

# Standards compliant.
set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Zc:rvalueCast
/Zc:strictStrings
set(_PXR_CXX_FLAGS "${_PXR_CXX_FLAGS} /Zc:rvalueCast \
/Zc:strictStrings \
/Zc:inline")

# Turn on all but informational warnings.
Expand Down
100 changes: 100 additions & 0 deletions cmake/modules/FindUFE.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
# - UFE finder module
# This module searches for a valid UFE installation.
# It searches for UFE's libraries and include header files
#
# Variables that will be defined:
# UFE_FOUND Defined if a UFE installation has been detected
# UFE_LIBRARY Path to UFE library
# UFE_INCLUDE_DIR Path to the UFE's include directories
#

if(APPLE)
find_path(UFE_LIBRARY_DIR
libufe_${UFE_MAJOR_VERSION}.dylib
HINTS
"${UFE_LIB_ROOT}"
"${MAYA_DEVKIT_LOCATION}"
"${MAYA_LOCATION}"
"$ENV{MAYA_LOCATION}"
"${MAYA_BASE_DIR}"
PATH_SUFFIXES
devkit/ufe/lib
lib/
DOC
"UFE's libraries path"
)
elseif(UNIX)
find_path(UFE_LIBRARY_DIR
libufe_${UFE_MAJOR_VERSION}.so
HINTS
"${UFE_LIB_ROOT}"
"${MAYA_DEVKIT_LOCATION}"
"${MAYA_LOCATION}"
"$ENV{MAYA_LOCATION}"
"${MAYA_BASE_DIR}"
PATH_SUFFIXES
devkit/ufe/lib
lib/
DOC
"UFE's libraries path"
)
elseif(WIN32)
find_path(UFE_LIBRARY_DIR
ufe_${UFE_MAJOR_VERSION}.lib
HINTS
"${UFE_LIB_ROOT}"
"${MAYA_DEVKIT_LOCATION}"
"${MAYA_LOCATION}"
"$ENV{MAYA_LOCATION}"
"${MAYA_BASE_DIR}"
PATH_SUFFIXES
devkit/ufe/lib
lib/
DOC
"UFE's libraries path"
)
endif()

find_path(UFE_INCLUDE_DIR
ufe/versionInfo.h
HINTS
"${UFE_INCLUDE_ROOT}"
"${MAYA_DEVKIT_LOCATION}"
"${MAYA_LOCATION}"
"$ENV{MAYA_LOCATION}"
"${MAYA_BASE_DIR}"
PATH_SUFFIXES
devkit/ufe/include
include/
DOC
"UFE's headers path"
)

message(STATUS "UFE Include directory: ${UFE_INCLUDE_DIR}")
message(STATUS "UFE Library directory: ${UFE_LIBRARY_DIR}")

foreach(UFE_LIB
ufe_${UFE_MAJOR_VERSION})

find_library(UFE_LIBRARY
NAMES
${UFE_LIB}
PATHS
${UFE_LIBRARY_DIR}
NO_DEFAULT_PATH
)

if (UFE_LIBRARY)
list(APPEND UFE_LIBRARIES ${UFE_LIBRARY})
endif()
endforeach(UFE_LIB)

# handle the QUIETLY and REQUIRED arguments and set UFE_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)

find_package_handle_standard_args(UFE
REQUIRED_VARS
UFE_INCLUDE_DIR
UFE_LIBRARIES
)
9 changes: 8 additions & 1 deletion cmake/modules/FindUSD.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ if (NOT DEFINED USD_ROOT AND NOT DEFINED ENV{USD_ROOT})
endif ()
endif ()

# On a system with an existing USD /usr/local installation added to the system
# PATH, use of PATHS in find_path incorrectly causes the existing USD
# installation to be found. As per
# https://cmake.org/cmake/help/v3.4/command/find_path.html
# and
# https://cmake.org/pipermail/cmake/2010-October/040460.html
# HINTS get searched before system paths, which produces the desired result.
find_path(USD_INCLUDE_DIR pxr/pxr.h
PATHS ${USD_ROOT}/include
HINTS ${USD_ROOT}/include
$ENV{USD_ROOT}/include
DOC "USD Include directory")

Expand Down
2 changes: 1 addition & 1 deletion docs/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ will force VP2 to use the "OpenGL -- Legacy" profile

see [Autodesk docs](https://knowledge.autodesk.com/support/maya/learn-explore/caas/CloudHelp/cloudhelp/2017/ENU/Maya/files/GUID-4928A912-DA6C-4734-863B-AB5959DA73C9-htm.html)

For selection to work, also need to set
For selection to work in versions of Maya prior to `2019`, you also need to set:
```
MAYA_VP2_USE_VP1_SELECTION=1
```
Expand Down
Loading

0 comments on commit b23402d

Please sign in to comment.