Skip to content

Commit

Permalink
[usdUtils] add a UsdUtilsTimeCodeRange type for representing a range …
Browse files Browse the repository at this point in the history
…between a start and end with a certain stride

Note that this change also adds a registration for the
testUsdUtilsStitchCpp test which was missing from the CMakeLists.txt, and
sorts all of the file and test declarations to make that easier to spot in
the future.

(Internal change: 1949685)
  • Loading branch information
mattyjams authored and pixar-oss committed Mar 22, 2019
1 parent 1b49243 commit 2a246bd
Show file tree
Hide file tree
Showing 7 changed files with 1,388 additions and 38 deletions.
103 changes: 65 additions & 38 deletions pxr/usd/lib/usdUtils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ pxr_library(usdUtils
stageCache
stitch
stitchClips
timeCodeRange

PUBLIC_HEADERS
api.h

PYTHON_CPPFILES
moduleDeps.cpp

Expand All @@ -47,6 +48,7 @@ pxr_library(usdUtils
wrapStageCache.cpp
wrapStitch.cpp
wrapStitchClips.cpp
wrapTimeCodeRange.cpp

PYMODULE_FILES
__init__.py
Expand All @@ -55,18 +57,19 @@ pxr_library(usdUtils

pxr_test_scripts(
testenv/testUsdUtilsAuthoring.py
testenv/testUsdUtilsSparseValueWriter.py
testenv/testUsdUtilsCoalescingDiagnosticDelegate.py
testenv/testUsdUtilsCreateNewUsdzPackage.py
testenv/testUsdUtilsDependencyExtractor.py
testenv/testUsdUtilsDependencyExtractor.py
testenv/testUsdUtilsFlattenLayerStack.py
testenv/testUsdUtilsIntrospection.py
testenv/testUsdUtilsModifyAssetPaths.py
testenv/testUsdUtilsPipeline.py
testenv/testUsdUtilsStageCache.py
testenv/testUsdUtilsStitchClips.py
testenv/testUsdUtilsStitch.py
testenv/testUsdUtilsVarSelsSessionLayer.py
testenv/testUsdUtilsIntrospection.py
testenv/testUsdUtilsModifyAssetPaths.py
testenv/testUsdUtilsPipeline.py
testenv/testUsdUtilsSparseValueWriter.py
testenv/testUsdUtilsStageCache.py
testenv/testUsdUtilsStitch.py
testenv/testUsdUtilsStitchClips.py
testenv/testUsdUtilsTimeCodeRange.py
testenv/testUsdUtilsVarSelsSessionLayer.py
)

pxr_build_test(testUsdUtilsCoalescingDiagnosticDelegateCpp
Expand All @@ -88,19 +91,28 @@ pxr_build_test(testUsdUtilsStitchCpp
testenv/testUsdUtilsStitch.cpp
)

pxr_build_test(testUsdUtilsTimeCodeRangeCpp
LIBRARIES
tf
usd
usdUtils
CPPFILES
testenv/testUsdUtilsTimeCodeRange.cpp
)

pxr_install_test_dir(
SRC testenv/testUsdUtilsAuthoring
DEST testUsdUtilsAuthoring
)

pxr_install_test_dir(
SRC testenv/testUsdUtilsCreateNewUsdzPackage
DEST testUsdUtilsCreateNewUsdzPackage
DEST testUsdUtilsCreateNewARKitUsdzPackage
)

pxr_install_test_dir(
SRC testenv/testUsdUtilsCreateNewUsdzPackage
DEST testUsdUtilsCreateNewARKitUsdzPackage
DEST testUsdUtilsCreateNewUsdzPackage
)

pxr_install_test_dir(
Expand Down Expand Up @@ -133,6 +145,11 @@ pxr_install_test_dir(
DEST testUsdUtilsFlattenLayerStack_OldOffsets
)

pxr_install_test_dir(
SRC testenv/testUsdUtilsIntrospection
DEST testUsdUtilsIntrospection
)

pxr_install_test_dir(
SRC testenv/testUsdUtilsModifyAssetPaths
DEST testUsdUtilsModifyAssetPaths
Expand All @@ -143,11 +160,6 @@ pxr_install_test_dir(
DEST testUsdUtilsPipeline
)

pxr_install_test_dir(
SRC testenv/testUsdUtilsIntrospection
DEST testUsdUtilsIntrospection
)

pxr_install_test_dir(
SRC testenv/testUsdUtilsStitch.testenv
DEST testUsdUtilsStitch
Expand All @@ -164,12 +176,6 @@ pxr_register_test(testUsdUtilsAuthoring
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsSparseValueWriter
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsSparseValueWriter"
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsCoalescingDiagnosticDelegate
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsCoalescingDiagnosticDelegate"
Expand All @@ -181,16 +187,16 @@ pxr_register_test(testUsdUtilsCoalescingDiagnosticDelegateCpp
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsCreateNewUsdzPackage
pxr_register_test(testUsdUtilsCreateNewARKitUsdzPackage
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsCreateNewUsdzPackage --check -l contents.txt package.usdz root.usd"
DIFF_COMPARE contents.txt
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsCreateNewUsdzPackage --check --arkit -l contents_arkit.txt package.usdz root.usd"
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsCreateNewARKitUsdzPackage
pxr_register_test(testUsdUtilsCreateNewUsdzPackage
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsCreateNewUsdzPackage --check --arkit -l contents_arkit.txt package.usdz root.usd"
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsCreateNewUsdzPackage --check -l contents.txt package.usdz root.usd"
DIFF_COMPARE contents.txt
EXPECTED_RETURN_CODE 0
)

Expand All @@ -211,14 +217,14 @@ pxr_register_test(testUsdUtilsDependencyExtractor2
pxr_register_test(testUsdUtilsDependencyExtractor3
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsDependencyExtractor crate.usdc crate-usdc.txt"
DIFF_COMPARE crate-usdc.txt
DIFF_COMPARE crate-usdc.txt
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsDependencyExtractor4
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsDependencyExtractor crate.usd crate-usd.txt"
DIFF_COMPARE crate-usd.txt
DIFF_COMPARE crate-usd.txt
EXPECTED_RETURN_CODE 0
)

Expand All @@ -238,6 +244,12 @@ pxr_register_test(testUsdUtilsFlattenLayerStack_OldOffsets
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsIntrospection
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsIntrospection"
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsModifyAssetPaths
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsModifyAssetPaths layer.usda modified.usda"
Expand All @@ -251,9 +263,9 @@ pxr_register_test(testUsdUtilsPipeline
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsIntrospection
pxr_register_test(testUsdUtilsSparseValueWriter
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsIntrospection"
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsSparseValueWriter"
EXPECTED_RETURN_CODE 0
)

Expand All @@ -263,12 +275,6 @@ pxr_register_test(testUsdUtilsStageCache
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsVarSelsSessionLayer
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsVarSelsSessionLayer"
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsStitch
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsStitch"
Expand All @@ -281,3 +287,24 @@ pxr_register_test(testUsdUtilsStitchClips
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsStitchCpp
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsStitchCpp"
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsTimeCodeRange
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsTimeCodeRange"
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsTimeCodeRangeCpp
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsTimeCodeRangeCpp"
EXPECTED_RETURN_CODE 0
)

pxr_register_test(testUsdUtilsVarSelsSessionLayer
PYTHON
COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdUtilsVarSelsSessionLayer"
EXPECTED_RETURN_CODE 0
)
1 change: 1 addition & 0 deletions pxr/usd/lib/usdUtils/module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ TF_WRAP_MODULE
TF_WRAP( StageCache );
TF_WRAP( Stitch );
TF_WRAP( StitchClips );
TF_WRAP( TimeCodeRange );
}
Loading

0 comments on commit 2a246bd

Please sign in to comment.