diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py index 7c27a2aa33..842615ba22 100644 --- a/build_scripts/build_usd.py +++ b/build_scripts/build_usd.py @@ -1109,7 +1109,12 @@ def InstallOpenVDB(context, force, buildArgs): def InstallOpenImageIO(context, force, buildArgs): with CurrentWorkingDirectory(DownloadURL(OIIO_URL, context, force)): - extraArgs = ['-DOIIO_BUILD_TOOLS=OFF', + # The only time that we want to build tools with OIIO is for testing + # purposes. Libraries such as usdImagingGL might need to use tools like + # idiff to compare the output images from their tests + buildOIIOTools = 'ON' if (context.buildUsdImaging + and context.buildTests) else 'OFF' + extraArgs = ['-DOIIO_BUILD_TOOLS={}'.format(buildOIIOTools), '-DOIIO_BUILD_TESTS=OFF', '-DUSE_PYTHON=OFF', '-DSTOP_ON_WARNING=OFF'] @@ -1969,7 +1974,8 @@ def __init__(self, args): self.buildPrman = self.buildImaging and args.build_prman self.prmanLocation = (os.path.abspath(args.prman_location) if args.prman_location else None) - self.buildOIIO = args.build_oiio + self.buildOIIO = args.build_oiio or (self.buildUsdImaging + and self.buildTests) self.buildOCIO = args.build_ocio # - Alembic Plugin diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake index 09cb7c3a35..abeccb76a8 100644 --- a/cmake/defaults/Packages.cmake +++ b/cmake/defaults/Packages.cmake @@ -190,6 +190,9 @@ if (PXR_BUILD_IMAGING) find_package(OpenEXR REQUIRED) find_package(OpenImageIO REQUIRED) add_definitions(-DPXR_OIIO_PLUGIN_ENABLED) + if (OIIO_idiff_BINARY) + set(IMAGE_DIFF_TOOL ${OIIO_idiff_BINARY} CACHE STRING "Uses idiff for image diffing") + endif() endif() # --OpenColorIO if (PXR_BUILD_OPENCOLORIO_PLUGIN) diff --git a/cmake/macros/Public.cmake b/cmake/macros/Public.cmake index 1ba646b81e..96fc5f6663 100644 --- a/cmake/macros/Public.cmake +++ b/cmake/macros/Public.cmake @@ -636,10 +636,22 @@ function(pxr_register_test TEST_NAME) return() endif() + set(OPTIONS RUN_SERIAL PYTHON REQUIRES_SHARED_LIBS REQUIRES_PYTHON_MODULES PERCEPTUAL) + set(ONE_VALUE_ARGS + CUSTOM_PYTHON + COMMAND + STDOUT_REDIRECT STDERR_REDIRECT + POST_COMMAND POST_COMMAND_STDOUT_REDIRECT POST_COMMAND_STDERR_REDIRECT + PRE_COMMAND PRE_COMMAND_STDOUT_REDIRECT PRE_COMMAND_STDERR_REDIRECT + FILES_EXIST FILES_DONT_EXIST + CLEAN_OUTPUT + EXPECTED_RETURN_CODE + TESTENV + WARN WARN_PERCENT HARD_WARN FAIL FAIL_PERCENT HARD_FAIL) + set(MULTI_VALUE_ARGS DIFF_COMPARE IMAGE_DIFF_COMPARE ENV PRE_PATH POST_PATH) + cmake_parse_arguments(bt - "RUN_SERIAL;PYTHON;REQUIRES_SHARED_LIBS;REQUIRES_PYTHON_MODULES" - "CUSTOM_PYTHON;COMMAND;STDOUT_REDIRECT;STDERR_REDIRECT;POST_COMMAND;POST_COMMAND_STDOUT_REDIRECT;POST_COMMAND_STDERR_REDIRECT;PRE_COMMAND;PRE_COMMAND_STDOUT_REDIRECT;PRE_COMMAND_STDERR_REDIRECT;FILES_EXIST;FILES_DONT_EXIST;CLEAN_OUTPUT;EXPECTED_RETURN_CODE;TESTENV" - "DIFF_COMPARE;ENV;PRE_PATH;POST_PATH" + "${OPTIONS}" "${ONE_VALUE_ARGS}" "${MULTI_VALUE_ARGS}" ${ARGN} ) @@ -719,6 +731,53 @@ function(pxr_register_test TEST_NAME) set(testWrapperCmd ${testWrapperCmd} --baseline-dir=${baselineDir}) endif() + if (bt_IMAGE_DIFF_COMPARE) + if (IMAGE_DIFF_TOOL) + foreach (compareFile ${bt_IMAGE_DIFF_COMPARE}) + set(testWrapperCmd ${testWrapperCmd} --image-diff-compare=${compareFile}) + endforeach () + + # For now the baseline directory is assumed by convention from the test + # name. There may eventually be cases where we'd want to specify it by + # an argument though. + set(baselineDir ${testenvDir}/baseline) + set(testWrapperCmd ${testWrapperCmd} --baseline-dir=${baselineDir}) + + if (bt_WARN) + set(testWrapperCmd ${testWrapperCmd} --warn=${bt_WARN}) + endif() + + if (bt_WARN_PERCENT) + set(testWrapperCmd ${testWrapperCmd} --warnpercent=${bt_WARN_PERCENT}) + endif() + + if (bt_HARD_WARN) + set(testWrapperCmd ${testWrapperCmd} --hardwarn=${bt_HARD_WARN}) + endif() + + if (bt_FAIL) + set(testWrapperCmd ${testWrapperCmd} --fail=${bt_FAIL}) + endif() + + if (bt_FAIL_PERCENT) + set(testWrapperCmd ${testWrapperCmd} --failpercent=${bt_FAIL_PERCENT}) + endif() + + if (bt_HARD_FAIL) + set(testWrapperCmd ${testWrapperCmd} --hardfail=${bt_HARD_FAIL}) + endif() + + if(bt_PERCEPTUAL) + set(testWrapperCmd ${testWrapperCmd} --perceptual) + endif() + + # Make sure to add the image diff tool to the PATH so + # it can be easily found within the testWrapper + get_filename_component(IMAGE_DIFF_TOOL_PATH ${IMAGE_DIFF_TOOL} DIRECTORY) + set(testWrapperCmd ${testWrapperCmd} --post-path=${IMAGE_DIFF_TOOL_PATH}) + endif() + endif() + if (bt_CLEAN_OUTPUT) set(testWrapperCmd ${testWrapperCmd} --clean-output-paths=${bt_CLEAN_OUTPUT}) endif() diff --git a/cmake/macros/testWrapper.py b/cmake/macros/testWrapper.py index 580f7da1e7..b73c19e57b 100644 --- a/cmake/macros/testWrapper.py +++ b/cmake/macros/testWrapper.py @@ -58,10 +58,28 @@ def _parseArgs(): action='append', help=('Compare output file with a file in the baseline-dir of the ' 'same name')) + parser.add_argument('--image-diff-compare', default=[], type=str, + action='append', + help=('Compare output image with an image in the baseline ' + 'of the same name')) + parser.add_argument('--fail', type=str, + help='The threshold for the acceptable difference of a pixel for failure') + parser.add_argument('--failpercent', type=str, + help='The percentage of pixels that can be different before failure') + parser.add_argument('--hardfail', type=str, + help='Triggers a failure if any pixels are above this threshold') + parser.add_argument('--warn', type=str, + help='The threshold for the acceptable difference of a pixel for a warning') + parser.add_argument('--warnpercent', type=str, + help='The percentage of pixels that can be different before a warning') + parser.add_argument('--hardwarn', type=str, + help='Triggers a warning if any pixels are above this threshold') + parser.add_argument('--perceptual', action='store_true', + help='Performs a test to see if two images are visually different') parser.add_argument('--files-exist', nargs='*', help=('Check that a set of files exist.')) parser.add_argument('--files-dont-exist', nargs='*', - help=('Check that a set of files exist.')) + help=('Check that a set of files do not exist.')) parser.add_argument('--clean-output-paths', nargs='*', help=('Path patterns to remove from the output files being diff\'d.')) parser.add_argument('--post-command', type=str, @@ -166,6 +184,56 @@ def _diff(fileName, baselineDir, verbose): return True +def _imageDiff(fileName, baseLineDir, verbose, env, warn=None, warnpercent=None, + hardwarn=None, fail=None, failpercent=None, hardfail=None, + perceptual=None): + import platform + if platform.system() == 'Windows': + imageDiff = 'idiff.exe' + else: + imageDiff = 'idiff' + + cmdArgs = [] + if warn is not None: + cmdArgs.extend(['-warn', warn]) + + if warnpercent is not None: + cmdArgs.extend(['-warnpercent', warnpercent]) + + if hardwarn is not None: + cmdArgs.extend(['-hardwarn', hardwarn]) + + if fail is not None: + cmdArgs.extend(['-fail', fail]) + + if failpercent is not None: + cmdArgs.extend(['-failpercent', failpercent]) + + if hardfail is not None: + cmdArgs.extend(['-hardfail', hardfail]) + + if perceptual: + cmdArgs.extend(['-p']) + + for image in glob.glob(fileName): + cmd = [imageDiff] + cmd.extend(cmdArgs) + cmd.extend([_resolvePath(baseLineDir, image), image]) + + if verbose: + print("image diffing with {0}".format(cmd)) + + # This will print any diffs to stdout which is a nice side-effect + # 0: OK: the images match within the warning and error thresholds. + # 1: Warning: the errors differ a little, but within error thresholds. + # 2: Failure: the errors differ a lot, outside error thresholds. + # 3: The images were not the same size and could not be compared. + # 4: File error: could not find or open input files, etc. + if subprocess.call(cmd, shell=False, env=env) not in (0, 1): + return False + + return True + def _copyTree(src, dest): ''' Copies the contents of src into dest.''' if not os.path.exists(dest): @@ -215,7 +283,7 @@ def _runCommand(raw_command, stdout_redir, stderr_redir, env, "Error: return code {0} doesn't match " "expected {1} (EXPECTED_RETURN_CODE).".format(retcode, expected_return_code)) - sys.exit(1) + sys.exit(1) if __name__ == '__main__': args = _parseArgs() @@ -225,6 +293,11 @@ def _runCommand(raw_command, stdout_redir, stderr_redir, env, "--diff-compare.") sys.exit(1) + if args.image_diff_compare and not args.baseline_dir: + sys.stderr.write("Error: --baseline-dir must be specified with " + "--image-diff-compare.") + sys.exit(1) + if args.clean_output_paths and not args.diff_compare: sys.stderr.write("Error: --diff-compare must be specified with " "--clean-output-paths.") @@ -313,4 +386,17 @@ def _runCommand(raw_command, stdout_redir, stderr_redir, env, '(DIFF_COMPARE).'.format(diff)) sys.exit(1) + if args.image_diff_compare: + converted = vars(args) + params = {key: converted[key] for key in + ('warn', 'warnpercent', 'hardwarn', + 'fail', 'failpercent', 'hardfail', 'perceptual') + if key in converted} + + for image in args.image_diff_compare: + if not _imageDiff(image, args.baseline_dir, args.verbose, env, **params): + sys.stderr.write('Error: image diff for {0} failed ' + '(IMAGE_DIFF_COMPARE).\n'.format(image)) + sys.exit(1) + sys.exit(0) diff --git a/pxr/usdImaging/bin/testusdview/CMakeLists.txt b/pxr/usdImaging/bin/testusdview/CMakeLists.txt index f9427a0b38..c4342b1e84 100644 --- a/pxr/usdImaging/bin/testusdview/CMakeLists.txt +++ b/pxr/usdImaging/bin/testusdview/CMakeLists.txt @@ -10,449 +10,945 @@ pxr_python_bin(testusdview usdviewq ) -if (NOT PXR_HEADLESS_TEST_MODE) - pxr_install_test_dir( - SRC testenv/testUsdviewAlive - DEST testUsdviewAlive - ) +if (${PXR_HEADLESS_TEST_MODE}) + message(STATUS "Skipping ${PXR_PACKAGE} tests because PXR_HEADLESS_TEST_MODE is ON") + return() +endif() - pxr_install_test_dir( - SRC testenv/testUsdviewFileArguments - DEST testUsdviewFileArguments1 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewAlive + DEST testUsdviewAlive +) - pxr_install_test_dir( - SRC testenv/testUsdviewFileArguments - DEST testUsdviewFileArguments2 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewFileArguments + DEST testUsdviewFileArguments1 +) - pxr_install_test_dir( - SRC testenv/testUsdviewFileArguments - DEST testUsdviewFileArguments3 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewFileArguments + DEST testUsdviewFileArguments2 +) - pxr_install_test_dir( - SRC testenv/testUsdviewFileArguments - DEST testUsdviewFileArguments4 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewFileArguments + DEST testUsdviewFileArguments3 +) - pxr_install_test_dir( - SRC testenv/testUsdviewFileArguments - DEST testUsdviewFileArguments5 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewFileArguments + DEST testUsdviewFileArguments4 +) - pxr_install_test_dir( - SRC testenv/testUsdviewFileArguments - DEST testUsdviewFileArguments6 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewFileArguments + DEST testUsdviewFileArguments5 +) - pxr_install_test_dir( - SRC testenv/testUsdviewFileArguments - DEST testUsdviewFileArguments7 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewFileArguments + DEST testUsdviewFileArguments6 +) - pxr_install_test_dir( - SRC testenv/testUsdviewWrapper - DEST testUsdviewWrapper1 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewFileArguments + DEST testUsdviewFileArguments7 +) - pxr_install_test_dir( - SRC testenv/testUsdviewWrapper - DEST testUsdviewWrapper2 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewWrapper + DEST testUsdviewWrapper1 +) - pxr_install_test_dir( - SRC testenv/testUsdviewWrapper - DEST testUsdviewWrapper3 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewWrapper + DEST testUsdviewWrapper2 +) - pxr_install_test_dir( - SRC testenv/testUsdviewWrapper - DEST testUsdviewWrapper4 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewWrapper + DEST testUsdviewWrapper3 +) - pxr_install_test_dir( - SRC testenv/testUsdviewWrapper - DEST testUsdviewWrapper5 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewWrapper + DEST testUsdviewWrapper4 +) - pxr_install_test_dir( - SRC testenv/testUsdviewPrimPathBar - DEST testUsdviewPrimPathBar - ) +pxr_install_test_dir( + SRC testenv/testUsdviewWrapper + DEST testUsdviewWrapper5 +) - pxr_install_test_dir( - SRC testenv/testUsdviewPrimSearch - DEST testUsdviewPrimSearch - ) +pxr_install_test_dir( + SRC testenv/testUsdviewPrimPathBar + DEST testUsdviewPrimPathBar +) - pxr_install_test_dir( - SRC testenv/testUsdviewPropertySearch - DEST testUsdviewPropertySearch - ) +pxr_install_test_dir( + SRC testenv/testUsdviewPrimSearch + DEST testUsdviewPrimSearch +) - pxr_install_test_dir( - SRC testenv/testUsdviewMetadatatabSelect - DEST testUsdviewMetadatatabSelect - ) +pxr_install_test_dir( + SRC testenv/testUsdviewPropertySearch + DEST testUsdviewPropertySearch +) - pxr_install_test_dir( - SRC testenv/testUsdviewTimeSamples - DEST testUsdviewTimeSamples - ) +pxr_install_test_dir( + SRC testenv/testUsdviewMetadatatabSelect + DEST testUsdviewMetadatatabSelect +) - pxr_install_test_dir( - SRC testenv/testUsdviewNavigationKeys - DEST testUsdviewNavigationKeys - ) +pxr_install_test_dir( + SRC testenv/testUsdviewTimeSamples + DEST testUsdviewTimeSamples +) - pxr_install_test_dir( - SRC testenv/testUsdviewReloadReopen - DEST testUsdviewReloadReopen - ) +pxr_install_test_dir( + SRC testenv/testUsdviewNavigationKeys + DEST testUsdviewNavigationKeys +) - pxr_install_test_dir( - SRC testenv/testUsdviewNoPlugins - DEST testUsdviewNoPlugins - ) +pxr_install_test_dir( + SRC testenv/testUsdviewReloadReopen + DEST testUsdviewReloadReopen +) - pxr_install_test_dir( - SRC testenv/testUsdviewInterpreterNoRender - DEST testUsdviewInterpreterNoRender - ) +pxr_install_test_dir( + SRC testenv/testUsdviewNoPlugins + DEST testUsdviewNoPlugins +) - pxr_install_test_dir( - SRC testenv/testUsdviewLoadPlugins - DEST testUsdviewLoadPlugins_alive - ) +pxr_install_test_dir( + SRC testenv/testUsdviewInterpreterNoRender + DEST testUsdviewInterpreterNoRender +) - pxr_install_test_dir( - SRC testenv/testUsdviewLoadPlugins - DEST testUsdviewLoadPlugins_multipleContainers - ) +pxr_install_test_dir( + SRC testenv/testUsdviewLoadPlugins + DEST testUsdviewLoadPlugins_alive +) - pxr_install_test_dir( - SRC testenv/testUsdviewLoadPlugins - DEST testUsdviewLoadPlugins_missingContainer - ) +pxr_install_test_dir( + SRC testenv/testUsdviewLoadPlugins + DEST testUsdviewLoadPlugins_multipleContainers +) - pxr_install_test_dir( - SRC testenv/testUsdviewLoadPlugins - DEST testUsdviewLoadPlugins_duplicateCommand - ) +pxr_install_test_dir( + SRC testenv/testUsdviewLoadPlugins + DEST testUsdviewLoadPlugins_missingContainer +) - pxr_install_test_dir( - SRC testenv/testUsdviewLoadPlugins - DEST testUsdviewLoadPlugins_chained - ) +pxr_install_test_dir( + SRC testenv/testUsdviewLoadPlugins + DEST testUsdviewLoadPlugins_duplicateCommand +) - pxr_install_test_dir( - SRC testenv/testUsdviewUpAxis - DEST testUsdviewUpAxis_zUp - ) +pxr_install_test_dir( + SRC testenv/testUsdviewLoadPlugins + DEST testUsdviewLoadPlugins_chained +) - pxr_install_test_dir( - SRC testenv/testUsdviewUpAxis - DEST testUsdviewUpAxis_yUp - ) +pxr_install_test_dir( + SRC testenv/testUsdviewUpAxis + DEST testUsdviewUpAxis_zUp +) - pxr_install_test_dir( - SRC testenv/testUsdviewDeactivate - DEST testUsdviewDeactivate - ) +pxr_install_test_dir( + SRC testenv/testUsdviewUpAxis + DEST testUsdviewUpAxis_yUp +) - pxr_install_test_dir( - SRC testenv/testUsdviewDefaultFontFamily - DEST testUsdviewDefaultFontFamily - ) +pxr_install_test_dir( + SRC testenv/testUsdviewDeactivate + DEST testUsdviewDeactivate +) - pxr_install_test_dir( - SRC testenv/testUsdviewSkinning - DEST testUsdviewSkinning - ) +pxr_install_test_dir( + SRC testenv/testUsdviewDefaultFontFamily + DEST testUsdviewDefaultFontFamily +) - pxr_install_test_dir( - SRC testenv/testUsdviewPrimTreeExpansion - DEST testUsdviewPrimTreeExpansion - ) +pxr_install_test_dir( + SRC testenv/testUsdviewSkinning + DEST testUsdviewCPUSkinning +) - pxr_install_test_dir( - SRC testenv/testUsdviewInfGeom - DEST testUsdviewInfGeom - ) +pxr_install_test_dir( + SRC testenv/testUsdviewSkinning + DEST testUsdviewGPUSkinning +) - pxr_install_test_dir( - SRC testenv/testUsdviewShaderEdits - DEST testUsdviewShaderEdits - ) +pxr_install_test_dir( + SRC testenv/testUsdviewPrimTreeExpansion + DEST testUsdviewPrimTreeExpansion +) - pxr_install_test_dir( - SRC testenv/testUsdviewPrimvarEdits - DEST testUsdviewPrimvarEdits - ) +pxr_install_test_dir( + SRC testenv/testUsdviewInfGeom + DEST testUsdviewInfGeom +) - pxr_install_test_dir( - SRC testenv/testUsdviewInstancingEdits - DEST testUsdviewInstancingEdits - ) +pxr_install_test_dir( + SRC testenv/testUsdviewShaderEdits + DEST testUsdviewShaderEdits +) - pxr_install_test_dir( - SRC testenv/testUsdviewAnimatedBounds - DEST testUsdviewAnimatedBounds - ) +pxr_install_test_dir( + SRC testenv/testUsdviewPrimvarEdits + DEST testUsdviewPrimvarEdits +) - pxr_install_test_dir( - SRC testenv/testUsdviewColorManagement - DEST testUsdviewColorManagement - ) +pxr_install_test_dir( + SRC testenv/testUsdviewInstancingEdits + DEST testUsdviewInstancingEdits +) - pxr_register_test(testUsdviewAlive - PRE_COMMAND "${PYTHON_EXECUTABLE} testUsdviewAliveSetup.py" - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testAlive.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewAnimatedBounds + DEST testUsdviewAnimatedBounds +) - pxr_register_test(testUsdviewFileArguments1 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testValidFileArg.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewColorManagement + DEST testUsdviewColorManagement +) - pxr_register_test(testUsdviewFileArguments2 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testValidFileArg.py test.usd" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewMaterialEdits + DEST testUsdviewMaterialEdits +) - pxr_register_test(testUsdviewFileArguments3 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testValidFileArg.py test.usdc" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewFreeCamera + DEST testUsdviewFreeCamera +) - pxr_register_test(testUsdviewFileArguments4 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testInvalidFileArg.py test.py" - STDERR_REDIRECT py_test_out - DIFF_COMPARE py_test_out - EXPECTED_RETURN_CODE 1 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewFreeCameraAspect + DEST testUsdviewFreeCameraAspect +) - pxr_register_test(testUsdviewFileArguments5 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testInvalidFileArg.py invalidSyntax.usda" - CLEAN_OUTPUT "(?:[A-Za-z]:)?/(?!refSphere2).*/" - STDERR_REDIRECT invalidSyntax_test_out - DIFF_COMPARE invalidSyntax_test_out - EXPECTED_RETURN_CODE 1 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewSelectionHighlighting + DEST testUsdviewSelectionHighlighting +) - pxr_register_test(testUsdviewFileArguments6 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testInvalidFileArg.py test.txt" - STDERR_REDIRECT txt_test_out - DIFF_COMPARE txt_test_out - EXPECTED_RETURN_CODE 1 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewRenderMode + DEST testUsdviewRenderMode +) - pxr_register_test(testUsdviewFileArguments7 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testInvalidFileArg.py missing" - STDERR_REDIRECT missing_test_out - DIFF_COMPARE missing_test_out - EXPECTED_RETURN_CODE 1 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewLights + DEST testUsdviewLights +) - pxr_register_test(testUsdviewWrapper1 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testCallback.py" - EXPECTED_RETURN_CODE 2 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewLights + DEST testUsdviewLights_yup +) - pxr_register_test(testUsdviewWrapper2 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testCallback_Invalid_1.py test.usda" - EXPECTED_RETURN_CODE 1 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewLightVisibility + DEST testUsdviewLightVisibility +) - pxr_register_test(testUsdviewWrapper3 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testCallback_Invalid_2.py test.usda" - EXPECTED_RETURN_CODE 1 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewLightVisibility + DEST testUsdviewLightVisibility_varying +) - pxr_register_test(testUsdviewWrapper4 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testCallback_Invalid_3.py test.usda" - EXPECTED_RETURN_CODE 1 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewBackgroundColor + DEST testUsdviewBackgroundColor +) - pxr_register_test(testUsdviewWrapper5 - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview test.usda" - EXPECTED_RETURN_CODE 2 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewComplexity + DEST testUsdviewComplexity +) - pxr_register_test(testUsdviewPrimPathBar - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewPrimPathBar.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewFieldOfView + DEST testUsdviewFieldOfView +) - pxr_register_test(testUsdviewPrimSearch - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewPrimSearch.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewClippingPlanes + DEST testUsdviewClippingPlanes +) - pxr_register_test(testUsdviewPropertySearch - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewPropertySearch.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewDefaultMaterial + DEST testUsdviewDefaultMaterial +) - pxr_register_test(testUsdviewMetadatatabSelect - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewMetadatatabSelect.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewCameraMaskMode + DEST testUsdviewCameraMaskMode +) - pxr_register_test(testUsdviewTimeSamples - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewTimeSamples.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewFrameSelection + DEST testUsdviewFrameSelection +) - pxr_register_test(testUsdviewNavigationKeys - RUN_SERIAL - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewNavigationKeys.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewLegacyImpl + DEST testUsdviewLegacyImpl +) - pxr_register_test(testUsdviewReloadReopen - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewReloadReopen.py test.usda" - EXPECTED_RETURN_CODE 0 - ) - - pxr_register_test(testUsdviewNoPlugins - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewNoPlugins.py --noplugins test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewOIT + DEST testUsdviewOIT +) - pxr_register_test(testUsdviewInterpreterNoRender - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewInterpreterNoRender.py --norender test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewAdditive + DEST testUsdviewAdditive +) - pxr_register_test(testUsdviewLoadPlugins_alive - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLoadPlugins_alive.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_install_test_dir( + SRC testenv/testUsdviewVariantSelection + DEST testUsdviewVariantSelection +) - pxr_register_test(testUsdviewLoadPlugins_multipleContainers - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLoadPlugins_multipleContainers.py test.usda" - EXPECTED_RETURN_CODE 0 - ) - pxr_register_test(testUsdviewLoadPlugins_missingContainer - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLoadPlugins_missingContainer.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_register_test(testUsdviewAlive + PRE_COMMAND "${PYTHON_EXECUTABLE} testUsdviewAliveSetup.py" + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testAlive.py test.usda" + EXPECTED_RETURN_CODE 0 +) - pxr_register_test(testUsdviewLoadPlugins_duplicateCommand - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLoadPlugins_duplicateCommand.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_register_test(testUsdviewFileArguments1 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testValidFileArg.py test.usda" + EXPECTED_RETURN_CODE 0 +) - pxr_register_test(testUsdviewLoadPlugins_chained - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLoadPlugins_chained.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_register_test(testUsdviewFileArguments2 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testValidFileArg.py test.usd" + EXPECTED_RETURN_CODE 0 +) - pxr_register_test(testUsdviewUpAxis_zUp - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewUpAxis_zUp.py testZUp.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_register_test(testUsdviewFileArguments3 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testValidFileArg.py test.usdc" + EXPECTED_RETURN_CODE 0 +) - pxr_register_test(testUsdviewUpAxis_yUp - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewUpAxis_yUp.py testYUp.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_register_test(testUsdviewFileArguments4 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testInvalidFileArg.py test.py" + STDERR_REDIRECT py_test_out + DIFF_COMPARE py_test_out + EXPECTED_RETURN_CODE 1 +) - pxr_register_test(testUsdviewDeactivate - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewDeactivate.py test.usda" - EXPECTED_RETURN_CODE 0 - ) - - pxr_register_test(testUsdviewDefaultFontFamily - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewDefaultFontFamily.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_register_test(testUsdviewFileArguments5 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testInvalidFileArg.py invalidSyntax.usda" + CLEAN_OUTPUT "(?:[A-Za-z]:)?/(?!refSphere2).*/" + STDERR_REDIRECT invalidSyntax_test_out + DIFF_COMPARE invalidSyntax_test_out + EXPECTED_RETURN_CODE 1 +) - pxr_register_test(testUsdviewSkinning - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewSkinning.py arm.usda" - EXPECTED_RETURN_CODE 0 - ) - - pxr_register_test(testUsdviewPrimTreeExpansion - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewPrimTreeExpansion.py test.usda" - EXPECTED_RETURN_CODE 0 - ) - - pxr_register_test(testUsdviewInfGeom - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewInfGeom.py infGeom.usda" - EXPECTED_RETURN_CODE 0 - ) - - pxr_register_test(testUsdviewShaderEdits - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewShaderEdits.py test.usda" - EXPECTED_RETURN_CODE 0 - ) - - pxr_register_test(testUsdviewPrimvarEdits - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewPrimvarEdits.py primvars.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_register_test(testUsdviewFileArguments6 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testInvalidFileArg.py test.txt" + STDERR_REDIRECT txt_test_out + DIFF_COMPARE txt_test_out + EXPECTED_RETURN_CODE 1 +) - pxr_register_test(testUsdviewInstancingEdits - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewInstancingEdits.py test.usda" - EXPECTED_RETURN_CODE 0 - ) +pxr_register_test(testUsdviewFileArguments7 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testInvalidFileArg.py missing" + STDERR_REDIRECT missing_test_out + DIFF_COMPARE missing_test_out + EXPECTED_RETURN_CODE 1 +) - pxr_register_test(testUsdviewAnimatedBounds - PYTHON - COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewAnimatedBounds.py test.usda" +pxr_register_test(testUsdviewWrapper1 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testCallback.py" + EXPECTED_RETURN_CODE 2 +) + +pxr_register_test(testUsdviewWrapper2 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testCallback_Invalid_1.py test.usda" + EXPECTED_RETURN_CODE 1 +) + +pxr_register_test(testUsdviewWrapper3 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testCallback_Invalid_2.py test.usda" + EXPECTED_RETURN_CODE 1 +) + +pxr_register_test(testUsdviewWrapper4 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testCallback_Invalid_3.py test.usda" + EXPECTED_RETURN_CODE 1 +) + +pxr_register_test(testUsdviewWrapper5 + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview test.usda" + EXPECTED_RETURN_CODE 2 +) + +pxr_register_test(testUsdviewPrimPathBar + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewPrimPathBar.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewPrimSearch + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewPrimSearch.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewPropertySearch + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewPropertySearch.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewMetadatatabSelect + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewMetadatatabSelect.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewTimeSamples + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewTimeSamples.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewNavigationKeys + RUN_SERIAL + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewNavigationKeys.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewNoPlugins + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewNoPlugins.py --noplugins test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewInterpreterNoRender + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewInterpreterNoRender.py --norender test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewLoadPlugins_alive + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLoadPlugins_alive.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewLoadPlugins_multipleContainers + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLoadPlugins_multipleContainers.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewLoadPlugins_missingContainer + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLoadPlugins_missingContainer.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewLoadPlugins_duplicateCommand + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLoadPlugins_duplicateCommand.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewLoadPlugins_chained + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLoadPlugins_chained.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewUpAxis_yUp + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewUpAxis_yUp.py testYUp.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewDefaultFontFamily + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewDefaultFontFamily.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewInstancingEdits + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewInstancingEdits.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewPrimTreeExpansion + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewPrimTreeExpansion.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewAnimatedBounds + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewAnimatedBounds.py test.usda" + EXPECTED_RETURN_CODE 0 +) + +if (MACOS) + message(STATUS "Skipping ${PXR_PACKAGE} tests because they are currently unsupported on macOS") + return() +endif() + +pxr_register_test(testUsdviewFreeCamera + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewFreeCamera.py Block.usda" + IMAGE_DIFF_COMPARE + start.png + block_F.png + block_L.png + block_B.png + block_R.png + phi45.png + adjustDist_05.png + adjustDist_05_20.png + rot_truck.png + truck_-1_-1.png + truck_1_1.png + end.png + FAIL 1 + FAIL_PERCENT 0.00002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewFreeCameraAspect + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewFreeCameraAspect.py test.usda" + IMAGE_DIFF_COMPARE + aspect185.png + aspect239.png + aspect05.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewSelectionHighlighting + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewSelectionHighlighting.py test.usda" + IMAGE_DIFF_COMPARE + sel_highlight.png + sel_highlight_none.png + sel_highlight_double.png + sel_highlight_instance.png + sel_highlight_color.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewRenderMode + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewRenderMode.py test.usda" + IMAGE_DIFF_COMPARE + render_mode_wireframe.png + render_mode_wireframe_on_surface.png + render_mode_smooth.png + render_mode_flat.png + render_mode_points.png + geom_only.png + geom_smooth.png + geom_flat.png + render_mode_hidden_surface_wireframe.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewLights + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLights.py test.usda" + IMAGE_DIFF_COMPARE + camera.png + noLights.png + dome.png + bothLights.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewLights_yup + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLightsYup.py testYup.usda" + IMAGE_DIFF_COMPARE + domeYup.png + bothLightsYup.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewLightVisibility + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLightVisibility.py test.usda" + IMAGE_DIFF_COMPARE + singleInvisible1.png + singleInvisible2.png + allVisible.png + allInvisible.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewLightVisibility_varying + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewVaryLightVisibility.py testVarying.usda" + IMAGE_DIFF_COMPARE + visible.png + invisible.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewBackgroundColor + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewBackgroundColor.py test.usda" + IMAGE_DIFF_COMPARE + black.png + grey_dark.png + grey_light.png + white.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewComplexity + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewComplexity.py test.usda" + IMAGE_DIFF_COMPARE + low.png + medium.png + high.png + very_high.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewFieldOfView + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewFieldOfView.py test.usda" + IMAGE_DIFF_COMPARE + fov45.png + fov60.png + fov90.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewClippingPlanes + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewClippingPlanes.py test.usda" + IMAGE_DIFF_COMPARE + no_override.png + override_near.png + override_far.png + override_both.png + before_recompute.png + after_recompute.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewDefaultMaterial + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewDefaultMaterial.py test.usda" + IMAGE_DIFF_COMPARE + none.png + ambient.png + specular.png + both.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewCameraMaskMode + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --camera /camera --renderer GL --testScript testUsdviewCameraMaskMode.py test.usda" + IMAGE_DIFF_COMPARE + none_gl.png + outline_gl.png + partial_gl.png + full_gl.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +if (EMBREE_FOUND AND ${PXR_BUILD_EMBREE_PLUGIN}) + pxr_register_test(testUsdviewCameraMaskMode_Embree + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --camera /camera --renderer Embree --testScript testUsdviewCameraMaskMode.py test.usda" + IMAGE_DIFF_COMPARE + none_embree.png + outline_embree.png + partial_embree.png + full_embree.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL EXPECTED_RETURN_CODE 0 + TESTENV testUsdviewCameraMaskMode ) - - if (NOT APPLE) +endif() + +pxr_register_test(testUsdviewFrameSelection + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewFrameSelection.py test.usda" + IMAGE_DIFF_COMPARE + framed.png + toggleToStart.png + rotatedStart.png + toggleToFramed.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewReloadReopen + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewReloadReopen.py test.usda" + IMAGE_DIFF_COMPARE + coloredAndFramed.png + reloaded.png + reopened.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewMaterialEdits + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdViewMaterialEdits.py test.usda" + IMAGE_DIFF_COMPARE + 1.png + 2.png + 3.png + FAIL 1 + FAIL_PERCENT 0.0002 + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewUpAxis_zUp + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewUpAxis_zUp.py testZUp.usda" + IMAGE_DIFF_COMPARE + zUp.png + yUp.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewDeactivate + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewDeactivate.py test.usda" + IMAGE_DIFF_COMPARE + singleDeactivate.png + parentDeactivate.png + parentChildDeactivate1.png + parentChildDeactivate2.png + FAIL 1 + FAIL_PERCENT 0.2 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewCPUSkinning + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewSkinning.py arm.usda" + IMAGE_DIFF_COMPARE + change_complexity.png + vis_frame_4.png + invis_frame_4.png + vis_frame_8.png + pre_skinned_prim_resync_frame_2.png + post_skinned_prim_resync_frame_2.png + pre_skel_resync_frame_6.png + post_skel_resync_frame_6.png + FAIL 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + ENV + USDSKELIMAGING_FORCE_CPU_COMPUTE=1 +) + +pxr_register_test(testUsdviewGPUSkinning + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewSkinning.py arm.usda" + IMAGE_DIFF_COMPARE + change_complexity.png + vis_frame_4.png + invis_frame_4.png + vis_frame_8.png + pre_skinned_prim_resync_frame_2.png + post_skinned_prim_resync_frame_2.png + pre_skel_resync_frame_6.png + post_skel_resync_frame_6.png + FAIL 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + ENV + USDSKELIMAGING_FORCE_CPU_COMPUTE=0 +) + +pxr_register_test(testUsdviewInfGeom + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewInfGeom.py infGeom.usda" + IMAGE_DIFF_COMPARE + infGeom.png + fixedGeom.png + FAIL 1 + FAIL_PERCENT 0.06 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +# The following test is disabled since it seems to require Renderman from +# the original testSpecs.xml +#pxr_register_test(testUsdviewShaderEdits +# PYTHON +# COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewShaderEdits.py test.usda" +# IMAGE_DIFF_COMPARE +# 0.png +# FAIL 1 +# FAIL_PERCENT 0.0002 +# PERCEPTUAL +# EXPECTED_RETURN_CODE 0 +#) + +pxr_register_test(testUsdviewPrimvarEdits + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewPrimvarEdits.py primvars.usda" + IMAGE_DIFF_COMPARE + start.png + add_fallback_primvar_smooth.png + add_fallback_primvar_flat.png + remove_fallback_primvar_flat.png + remove_fallback_primvar_wireOnSurf.png + add_unused_primvars.png + remove_unused_primvars.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewOIT + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewOIT.py test.usda" + IMAGE_DIFF_COMPARE + oit.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewAdditive + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewAdditive.py test.usda" + IMAGE_DIFF_COMPARE + additive.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewLegacyImpl + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewLegacyImpl.py test.usda" + IMAGE_DIFF_COMPARE + perspective.png + ortho.png + FAIL 1 + FAIL_PERCENT 0.000031 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +pxr_register_test(testUsdviewVariantSelection + PYTHON + COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewVariantSelection.py test.usda" + IMAGE_DIFF_COMPARE + capsule1.png + cone1.png + cube1.png + cylinder1.png + capsule2.png + cone2.png + cube2.png + cylinder2.png + FAIL 1 + FAIL_PERCENT 0.0002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 +) + +if(OPENCOLORIO_FOUND AND ${PXR_BUILD_OPENCOLORIO_PLUGIN}) pxr_register_test(testUsdviewColorManagement PYTHON COMMAND "${CMAKE_INSTALL_PREFIX}/bin/testusdview --testScript testUsdviewColorManagement.py test.usda" + IMAGE_DIFF_COMPARE + colorCorrectionOCIO_g22.png + colorCorrectionOCIO_linear.png + colorCorrectionSRGB.png + colorCorrectionDisabled.png EXPECTED_RETURN_CODE 0 ENV OCIO=test.ocio ) - endif() - endif() diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewBackgroundColor/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewBackgroundColor/test.usda index ddb808b5e1..c55a5141aa 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewBackgroundColor/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewBackgroundColor/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewClippingPlanes/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewClippingPlanes/test.usda index ddb808b5e1..c55a5141aa 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewClippingPlanes/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewClippingPlanes/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewComplexity/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewComplexity/test.usda index ddb808b5e1..c55a5141aa 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewComplexity/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewComplexity/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultMaterial/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultMaterial/test.usda index ddb808b5e1..c55a5141aa 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultMaterial/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewDefaultMaterial/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFieldOfView/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFieldOfView/test.usda index 83edc065ae..8551f69f7a 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFieldOfView/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFieldOfView/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFrameSelection/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFrameSelection/test.usda index ddb808b5e1..c55a5141aa 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFrameSelection/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFrameSelection/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCameraAspect/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCameraAspect/test.usda index 83edc065ae..8551f69f7a 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCameraAspect/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewFreeCameraAspect/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInfGeom/infGeom.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInfGeom/infGeom.usda index cff7b7afde..3383b2580e 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInfGeom/infGeom.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewInfGeom/infGeom.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Mesh "PentagonWithInfPoint" { diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/test.usda index 3c740b4f7c..a90be497bd 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLightVisibility/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/test.usda index 02e049b3a1..3862d070de 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewLights/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewReloadReopen/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewReloadReopen/test.usda index ddb808b5e1..c55a5141aa 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewReloadReopen/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewReloadReopen/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderMode/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderMode/test.usda index ddb808b5e1..c55a5141aa 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderMode/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewRenderMode/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSelectionHighlighting/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSelectionHighlighting/test.usda index 954afb017e..70eb3aeef7 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSelectionHighlighting/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewSelectionHighlighting/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "ProtoRed" { diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testZUp.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testZUp.usda index ddb808b5e1..c55a5141aa 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testZUp.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewUpAxis/testZUp.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Implicits" ( add variantSets = "shapeVariant" diff --git a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewVariantSelection/test.usda b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewVariantSelection/test.usda index 364189003d..7e8cd555fb 100644 --- a/pxr/usdImaging/bin/testusdview/testenv/testUsdviewVariantSelection/test.usda +++ b/pxr/usdImaging/bin/testusdview/testenv/testUsdviewVariantSelection/test.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Shapes" ( add variantSets = ["a_shapeVariant", "b_shapeVariant"] diff --git a/pxr/usdImaging/usdImagingGL/CMakeLists.txt b/pxr/usdImaging/usdImagingGL/CMakeLists.txt index accce42757..90ae29ab79 100644 --- a/pxr/usdImaging/usdImagingGL/CMakeLists.txt +++ b/pxr/usdImaging/usdImagingGL/CMakeLists.txt @@ -77,7 +77,17 @@ pxr_library(usdImagingGL # # C++ tests - Only build on all platforms for now. # -set(TEST_LIBS "arch" "garch" "glf" "hd" "sdf" "tf" "usd" "usdUtils" "usdImaging" "usdImagingGL") +set(TEST_LIBS + "arch" + "garch" + "glf" + "hd" + "sdf" + "tf" + "usd" + "usdUtils" + "usdImaging" + "usdImagingGL") pxr_build_test(testUsdImagingGLBasicDrawing LIBRARIES @@ -142,3 +152,4406 @@ pxr_build_test(testUsdImagingGLSurfaceShader unitTestGLDrawing.cpp testenv/testUsdImagingGLSurfaceShader.cpp ) + +if (${PXR_HEADLESS_TEST_MODE}) + message(STATUS "Skipping ${PXR_PACKAGE} tests because PXR_HEADLESS_TEST_MODE is ON") + return() +endif() + +if (MACOS) + message(STATUS "Skipping ${PXR_PACKAGE} tests because they are currently unsupported on macOS") + return() +endif() + + +# +# Install all the test data +# + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLBasicDrawing + DEST testUsdImagingGLBasicDrawing +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLBasicDrawingNonBindless + DEST testUsdImagingGLBasicDrawingNonBindless +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLBasicLighting + DEST testUsdImagingGLBasicLighting +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLCurves + DEST testUsdImagingGLCurves +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPoints + DEST testUsdImagingGLPoints +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLDomeLight + DEST testUsdImagingGLDomeLight +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLDoubleSided + DEST testUsdImagingGLDoubleSided +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLExtents + DEST testUsdImagingGLExtents +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLImplicits + DEST testUsdImagingGLImplicits +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLHoleFaces + DEST testUsdImagingGLHoleFaces +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLSubdivisionOsd3 + DEST testUsdImagingGLSubdivisionOsd3 +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLComplexityOsd3 + DEST testUsdImagingGLComplexityOsd3 +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLBasisCurvesWithColor + DEST testUsdImagingGLBasisCurvesWithColor +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLBasisCurvesWithScale + DEST testUsdImagingGLBasisCurvesWithScale +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLBasisCurvesWithNormals + DEST testUsdImagingGLBasisCurvesWithNormals +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLSubdivisionSchemeNone + DEST testUsdImagingGLSubdivisionSchemeNone +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLVaryingTopology + DEST testUsdImagingGLVaryingTopology +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLVaryingSharedMeshTopology + DEST testUsdImagingGLVaryingSharedMeshTopology +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLEmptyMesh + DEST testUsdImagingGLEmptyMesh +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPrimitiveDrawing + DEST testUsdImagingGLPrimitiveDrawing +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPrimitiveDrawingRef + DEST testUsdImagingGLPrimitiveDrawingRef +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLFlatShading + DEST testUsdImagingGLFlatShading +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLFlatShadingRef + DEST testUsdImagingGLFlatShadingRef +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLShadeMaterial + DEST testUsdImagingGLShadeMaterial +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLShadeMaterialRef + DEST testUsdImagingGLShadeMaterialRef +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLSphere + DEST testUsdImagingGLSphere +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLNurbsCurves + DEST testUsdImagingGLNurbsCurves +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLNurbsPatch + DEST testUsdImagingGLNurbsPatch +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLFramingBBox + DEST testUsdImagingGLFramingBBox +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLInstancing + DEST testUsdImagingGLInstancing +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPickAndHighlight + DEST testUsdImagingGLPickAndHighlight +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLHighlight + DEST testUsdImagingGLHighlight +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLSurfaceShader + DEST testUsdImagingGLSurfaceShader +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLShadeBadTexture + DEST testUsdImagingGLShadeBadTexture +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLShadeBool + DEST testUsdImagingGLShadeBool +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPointInstancer + DEST testUsdImagingGLPointInstancer +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLResync + DEST testUsdImagingGLResync +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPurpose + DEST testUsdImagingGLPurpose +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPrimvarSharing + DEST testUsdImagingGLPrimvarSharing +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLColorOpacityPrimvar + DEST testUsdImagingGLColorOpacityPrimvar +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLTriangleSubdivisionRuleOsd3 + DEST testUsdImagingGLTriangleSubdivisionRuleOsd3 +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLWireframeOpacity + DEST testUsdImagingGLWireframeOpacity +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLCards + DEST testUsdImagingGLCards +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLMeshQuadrangulation + DEST testUsdImagingGLMeshQuadrangulation +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLSkeleton + DEST testUsdImagingGLSkeleton +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLSkelBlendShapes + DEST testUsdImagingGLSkelBlendShapes +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLNormals + DEST testUsdImagingGLNormals +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPreviewSurface + DEST testUsdImagingGLPreviewSurface +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPremultiplyAlpha + DEST testUsdImagingGLPremultiplyAlpha +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLInstancingWithMaterials + DEST testUsdImagingGLInstancingWithMaterials +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLFaceVarying + DEST testUsdImagingGLFaceVarying +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLShadingPrimvars + DEST testUsdImagingGLShadingPrimvars +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLTextureWrap + DEST testUsdImagingGLTextureWrap +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLUsdLux + DEST testUsdImagingGLUsdLux +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLUsdUdims + DEST testUsdImagingGLUsdUdims +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLUsdSkel + DEST testUsdImagingGLUsdSkel +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPopOut + DEST testUsdImagingGLPopOut +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLMaterialTag + DEST testUsdImagingGLMaterialTag +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLMaterialX + DEST testUsdImagingGLMaterialX +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLInstancePrimvars + DEST testUsdImagingGLInstancePrimvars +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLSimpleVolumes + DEST testUsdImagingGLSimpleVolumes +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLVolumeMaterial + DEST testUsdImagingGLVolumeMaterial +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLVdbVolume + DEST testUsdImagingGLVdbVolume +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLBasisCurvesVaryingTopology + DEST testUsdImagingGLBasisCurvesVaryingTopology +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLAnimatedCamera + DEST testUsdImagingGLAnimatedCamera +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLAnimatedLights + DEST testUsdImagingGLAnimatedLights +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLSdr + DEST testUsdImagingGLSdr +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLInvalidInfoId + DEST testUsdImagingGLInvalidInfoId +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLInheritedPurpose + DEST testUsdImagingGLInheritedPurpose +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLInvalidUniversalSurface + DEST testUsdImagingGLInvalidUniversalSurface +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLFallbackPrimTypes + DEST testUsdImagingGLFallbackPrimTypes +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPrimvarProcessing + DEST testUsdImagingGLPrimvarProcessing +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLComposite + DEST testUsdImagingGLComposite +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPresentDisabled + DEST testUsdImagingGLPresentDisabled +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLFraming + DEST testUsdImagingGLFraming +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLHWFaceCulling + DEST testUsdImagingGLHWFaceCulling +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLMipmap + DEST testUsdImagingGLMipmap +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLAovVisualization + DEST testUsdImagingGLAovVisualization +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLPrimvarRefinement + DEST testUsdImagingGLPrimvarRefinement +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLDisplacement + DEST testUsdImagingGLDisplacement +) + +pxr_install_test_dir( + SRC testenv/testUsdImagingGLGeomSubsets + DEST testUsdImagingGLGeomSubsets +) + +# +# Register all the tests +# + +pxr_register_test(testUsdImagingGLBasicDrawing + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage basicDrawing/basicDrawing.usda -write testUsdImagingGLBasicDrawing.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLBasicDrawing_refined + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -complexity 1.1 -stage basicDrawing/basicDrawing.usda -write testUsdImagingGLBasicDrawing_refined.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_refined.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLBasicDrawing_leftHanded + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -shading wireOnSurface -stage basicDrawing/leftHanded.usda -write testUsdImagingGLBasicDrawing_leftHanded.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_leftHanded.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLBasicDrawing_points + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage points.usda -frameAll -write testUsdImagingGLBasicDrawing_points.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_points.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLBasicDrawing_clipped + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage basicDrawing/basicDrawing.usda -clipPlane 1 0 0 0 -frameAll -write testUsdImagingGLBasicDrawing_clipped.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_clipped.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLBasicDrawing_points_clipped + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage points.usda -clipPlane -1 0 0 0 -frameAll -write testUsdImagingGLBasicDrawing_points_clipped.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_points_clipped.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLBasicDrawing_id + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -idRender -stage basicDrawing/shaders.usd -frameAll -write testUsdImagingGLBasicDrawing_id.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_id.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLBasicDrawing_subdivTags + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage subdivTags.usda -frameAll -lighting -write testUsdImagingGLBasicDrawing_subdivTags.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_subdivTags.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLBasicDrawing_subdivTagsRefined + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage subdivTags.usda -frameAll -lighting -complexity 1.4 -write testUsdImagingGLBasicDrawing_subdivTagsRefined.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_subdivTagsRefined.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLBasicDrawing_inputShaderEncoding + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage basicDrawing/newInputShaderEncoding.usd -frameAll -lighting -write testUsdImagingGLBasicDrawing_inputShaderEncoding.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_inputShaderEncoding.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLBasicDrawing_textureChannels + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage basicDrawing/textureChannels.usd -frameAll -lighting -write testUsdImagingGLBasicDrawing_textureChannels.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_textureChannels.png + FAIL 0.01 + FAIL_PERCENT 1 + WARN 0.02 + WARN_PERCENT 0.05 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLBasicDrawingNonBindless_batch + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -offscreen -stage shaders.usda -frameAll -write testUsdImagingGLBasicDrawingNonBindless_batch.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawingNonBindless_batch.png + FAIL 1 + FAIL_PERCENT 1.1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawingNonBindless + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + +pxr_register_test(testUsdImagingGLBasicLighting + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -stage basicDrawing.usda -write testUsdImagingGLBasicLighting.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicLighting.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicLighting +) + +pxr_register_test(testUsdImagingGLBasicLighting_refined + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -complexity 1.1 -lighting -stage basicDrawing.usda -write testUsdImagingGLBasicLighting_refined.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicLighting_refined.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicLighting +) + +pxr_register_test(testUsdImagingGLCurves + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage basicCurves.usda -write testUsdImagingGLCurves.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLCurves.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLCurves +) + +pxr_register_test(testUsdImagingGLCurves_refined + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -complexity 1.1 -stage basicCurves.usda -write testUsdImagingGLCurves_refined.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLCurves_refined.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLCurves +) + +pxr_register_test(testUsdImagingGL_moreCurves + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage moreCurves.usda -camlight -shading smooth -write testUsdImagingGL_moreCurves.png" + IMAGE_DIFF_COMPARE + testUsdImagingGL_moreCurves.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLCurves +) + +pxr_register_test(testUsdImagingGL_moreCurves_refined + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -complexity 1.1 -stage moreCurves.usda -camlight -shading smooth -write testUsdImagingGL_moreCurves_refined.png" + IMAGE_DIFF_COMPARE + testUsdImagingGL_moreCurves_refined.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLCurves +) + +pxr_register_test(testUsdImagingGL_moreCurves_faketubes + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -complexity 1.2 -stage moreCurves.usda -camlight -shading smooth -write testUsdImagingGL_moreCurves_faketubes.png" + IMAGE_DIFF_COMPARE + testUsdImagingGL_moreCurves_faketubes.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLCurves +) + +pxr_register_test(testUsdImagingGL_moreCurves_tubes + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -complexity 1.3 -stage moreCurves.usda -camlight -shading smooth -write testUsdImagingGL_moreCurves_tubes.png" + IMAGE_DIFF_COMPARE + testUsdImagingGL_moreCurves_tubes.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLCurves +) + +pxr_register_test(testUsdImagingGL_pinnedCurves + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -complexity 1.3 -stage pinnedCurves.usda -camlight -shading smooth -write testUsdImagingGL_pinnedCurves.png" + IMAGE_DIFF_COMPARE + testUsdImagingGL_pinnedCurves.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLCurves +) + +pxr_register_test(testUsdImagingGLPoints + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage basicPoints.usda -write testUsdImagingGLPoints.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLPoints.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPoints +) + +pxr_register_test(testUsdImagingGLPoints_refined + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -complexity 1.1 -stage basicPoints.usda -write testUsdImagingGLPoints_refined.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLPoints_refined.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPoints +) + +pxr_register_test(testUsdImagingGLDomeLight_ZupFront + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -sceneLights -shading smooth -complexity 1.3 -camera /Scene/FrontCamera -stage domeLightZup.usda -write testUsdImagingGLDomeLight_ZupFront.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDomeLight_ZupFront.png + FAIL 1 + FAIL_PERCENT 0.005 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDomeLight +) + +pxr_register_test(testUsdImagingGLDomeLight_ZupBack + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -sceneLights -shading smooth -complexity 1.3 -camera /Scene/BackCamera -stage domeLightZup.usda -write testUsdImagingGLDomeLight_ZupBack.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDomeLight_ZupBack.png + FAIL 1 + FAIL_PERCENT 0.006 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDomeLight +) + +pxr_register_test(testUsdImagingGLDomeLight_YupFront + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -sceneLights -shading smooth -complexity 1.3 -camera /Scene/FrontCamera -stage domeLightYup.usda -write testUsdImagingGLDomeLight_YupFront.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDomeLight_YupFront.png + FAIL 1 + FAIL_PERCENT 0.002 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDomeLight +) + +pxr_register_test(testUsdImagingGLDomeLight_YupBack + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -sceneLights -shading smooth -complexity 1.3 -camera /Scene/BackCamera -stage domeLightYup.usda -write testUsdImagingGLDomeLight_YupBack.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDomeLight_YupBack.png + FAIL 1 + FAIL_PERCENT 0.003 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDomeLight +) + +pxr_register_test(testUsdImagingGLDomeLight_multi + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -sceneLights -shading smooth -complexity 1.3 -stage multiDomeLights.usda -write testUsdImagingGLDomeLight_multi.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDomeLight_multi.png + FAIL 0.01 + FAIL_PERCENT 0.001 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDomeLight +) + +pxr_register_test(testUsdImagingGLDomeLight_metallic + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -sceneLights -shading smooth -complexity 1.3 -stage sphereMetallic.usda -write testUsdImagingGLDomeLight_metallic.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDomeLight_metallic.png + FAIL 1 + FAIL_PERCENT 0.001 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDomeLight +) + +pxr_register_test(testUsdImagingGLDomeLight_rough + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -sceneLights -shading smooth -complexity 1.3 -stage sphereRough.usda -write testUsdImagingGLDomeLight_rough.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDomeLight_rough.png + FAIL 1 + FAIL_PERCENT 0.005 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDomeLight +) + +pxr_register_test(testUsdImagingGLDomeLight_grid + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -sceneLights -shading smooth -complexity 1.3 -stage sphereGrid.usda -write testUsdImagingGLDomeLight_grid.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDomeLight_grid.png + FAIL 1 + FAIL_PERCENT 0.5 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDomeLight +) + +pxr_register_test(testUsdImagingGLDomeLight_metallic_specwf + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -sceneLights -shading smooth -complexity 1.3 -stage sphereMetallic_specwf.usda -write testUsdImagingGLDomeLight_metallic_specwf.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDomeLight_metallic_specwf.png + FAIL 1 + FAIL_PERCENT 0.4 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDomeLight +) + +pxr_register_test(testUsdImagingGLDomeLight_grid_specwf + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -sceneLights -shading smooth -complexity 1.3 -stage sphereGrid_specwf.usda -write testUsdImagingGLDomeLight_grid_specwf.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDomeLight_grid_specwf.png + FAIL 1 + FAIL_PERCENT 0.6 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDomeLight +) + +pxr_register_test(testUsdImagingGLDomeLight_invis + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -sceneLights -shading smooth -complexity 1.3 -stage invisDome.usda -write testUsdImagingGLDomeLight_invis.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDomeLight_invis.png + FAIL 0.01 + FAIL_PERCENT 0.2 + WARN 0.02 + WARN_PERCENT 0.005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDomeLight +) + +pxr_register_test(testUsdImagingGLDoubleSided + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -stage doubleSided2.usda -write testUsdImagingGLDoubleSided.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDoubleSided.png + FAIL 1 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDoubleSided +) + +pxr_register_test(testUsdImagingGLExtents + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -stage testExtents.usda -write testUsdImagingGLExtents.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLExtents.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLExtents +) + +pxr_register_test(testUsdImagingGLImplicits + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -shading wireOnSurface -frameAll -stage implicits.usda -write testUsdImagingGLImplicits.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLImplicits.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLImplicits +) + +pxr_register_test(testUsdImagingGLImplicits_refined + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -shading wireOnSurface -complexity 1.1 -frameAll -stage implicits.usda -write testUsdImagingGLImplicits_refined.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLImplicits_refined.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLImplicits +) + +pxr_register_test(testUsdImagingGLHoleFaces + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -stage holeFaces.usda -write testUsdImagingGLHoleFaces.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLHoleFaces.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLHoleFaces +) + +pxr_register_test(testUsdImagingGLSubdivision_1_1 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -stage subdivMesh.usda -write testUsdImagingGLSubdivision_1_1.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLSubdivision_1_1.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSubdivisionOsd3 +) + +pxr_register_test(testUsdImagingGLSubdivision_1_2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.2 -offscreen -lighting -stage subdivMesh.usda -write testUsdImagingGLSubdivision_1_2.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLSubdivision_1_2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSubdivisionOsd3 +) + +pxr_register_test(testUsdImagingGLSubdivision_1_3 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.3 -offscreen -lighting -stage subdivMesh.usda -write testUsdImagingGLSubdivision_1_3.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLSubdivision_1_3.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSubdivisionOsd3 +) + +pxr_register_test(testUsdImagingGLSubdivision_lefthanded_1_1 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -frameAll -cullStyle back -offscreen -lighting -stage lefthandedMesh.usda -write testUsdImagingGLSubdivision_lefthanded_1_1.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLSubdivision_lefthanded_1_1.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSubdivisionOsd3 +) + +pxr_register_test(testUsdImagingGLSubdivision_lefthanded_1_2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.2 -frameAll -cullStyle back -offscreen -lighting -stage lefthandedMesh.usda -write testUsdImagingGLSubdivision_lefthanded_1_2.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLSubdivision_lefthanded_1_2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSubdivisionOsd3 +) + +pxr_register_test(testUsdImagingGLComplexityOsd3 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexities 1.0 1.1 1.2 -offscreen -lighting -stage subdivMesh.usda -write testUsdImagingGLComplexity.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLComplexity_1.png + testUsdImagingGLComplexity_1.1.png + testUsdImagingGLComplexity_1.2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLComplexityOsd3 +) + +pxr_register_test(testUsdImagingGLBasisCurvesWithColor + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexities 1.0 1.1 1.2 1.3 -offscreen -frameAll -stage curveWithVertexColor.usda -write testUsdImagingGLBasisCurvesWithColor.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasisCurvesWithColor_1.png + testUsdImagingGLBasisCurvesWithColor_1.1.png + testUsdImagingGLBasisCurvesWithColor_1.2.png + testUsdImagingGLBasisCurvesWithColor_1.3.png + FAIL_PERCENT 30 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasisCurvesWithColor +) + +pxr_register_test(testUsdImagingGLBasisCurvesWithScale + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexities 1.1 -offscreen -lighting -stage curve-scales-flat.usd -write testUsdImagingGLBasisCurvesWithScale.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasisCurvesWithScale_1.1.png + FAIL_PERCENT 30 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasisCurvesWithScale +) + +pxr_register_test(testUsdImagingGLBasisCurvesWithNormals + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexities 1.1 -frameAll -offscreen -lighting -stage curve-authored-normals.usd -write testUsdImagingGLBasisCurvesWithNormals.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasisCurvesWithNormals_1.1.png + FAIL_PERCENT 3 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasisCurvesWithNormals +) + +pxr_register_test(testUsdImagingGLSubdivisionSchemeNone + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -complexities 1.0 1.3 -offscreen -lighting -stage ring.usda -write testUsdImagingGLSubdivisionSchemeNone.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLSubdivisionSchemeNone_1.png + testUsdImagingGLSubdivisionSchemeNone_1.3.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSubdivisionSchemeNone +) + +pxr_register_test(testUsdImagingGLSubdivisionSchemeNone_NoLights + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -complexities 1.0 1.3 -offscreen -shading wireOnSurface -stage ring.usda -write testUsdImagingGLSubdivisionSchemeNone_NoLights.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLSubdivisionSchemeNone_NoLights_1.png + testUsdImagingGLSubdivisionSchemeNone_NoLights_1.3.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSubdivisionSchemeNone +) + +pxr_register_test(testUsdImagingGLVaryingTopology + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -times 1 2 3 -stage varying.usda -write testUsdImagingGLVaryingTopology.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVaryingTopology_001.png + testUsdImagingGLVaryingTopology_002.png + testUsdImagingGLVaryingTopology_003.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVaryingTopology + ENV + HGIGL_ENABLE_MULTI_DRAW_INDIRECT=0 +) + +pxr_register_test(testUsdImagingGLVaryingSharedMeshTopologyImmediate + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -camlight -times 1 2 3 1 2 3 -stage meshVaryingTopologyWithSharing.usda -camera /MainCamera -write testUsdImagingGLVaryingSharedMeshTopology.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVaryingSharedMeshTopology_001.png + testUsdImagingGLVaryingSharedMeshTopology_002.png + testUsdImagingGLVaryingSharedMeshTopology_003.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVaryingSharedMeshTopology + ENV + HGIGL_ENABLE_MULTI_DRAW_INDIRECT=0 +) + +pxr_register_test(testUsdImagingGLVaryingSharedMeshTopologyMDI + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -camlight -times 1 2 3 1 2 3 -stage meshVaryingTopologyWithSharing.usda -camera /MainCamera -write testUsdImagingGLVaryingSharedMeshTopology.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVaryingSharedMeshTopology_001.png + testUsdImagingGLVaryingSharedMeshTopology_002.png + testUsdImagingGLVaryingSharedMeshTopology_003.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVaryingSharedMeshTopology + ENV + HGIGL_ENABLE_MULTI_DRAW_INDIRECT=1 +) + +pxr_register_test(testUsdImagingGLEmptyMesh + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -times 1 5 3 7 -stage test.usda -write testUsdImagingGLEmptyMesh.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLEmptyMesh_001.png + testUsdImagingGLEmptyMesh_005.png + testUsdImagingGLEmptyMesh_003.png + testUsdImagingGLEmptyMesh_007.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLEmptyMesh +) + +pxr_register_test(testUsdImagingGLPrimitiveDrawing + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage primitives.usda -write testUsdImagingGLPrimitiveDrawing.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLPrimitiveDrawing.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPrimitiveDrawing +) + +pxr_register_test(testUsdImagingGLPrimitiveDrawingRef + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage primitives.usda -write testUsdImagingGLPrimitiveDrawingRef.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLPrimitiveDrawingRef.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPrimitiveDrawingRef + ENV + HD_ENABLED=0 +) + +pxr_register_test(testUsdImagingGLFlatShading + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -shading flat -stage primitives.usda -write testUsdImagingGLFlatShading.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFlatShading.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFlatShading +) + +pxr_register_test(testUsdImagingGLFlatShadingRef + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -shading flat -stage primitives.usda -write testUsdImagingGLFlatShadingRef.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFlatShadingRef.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFlatShadingRef + ENV + HD_ENABLED=0 +) + +pxr_register_test(testUsdImagingGLShadeMaterial + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage coloredCubes.usda -write testUsdImagingGLShadeMaterial.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLShadeMaterial.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLShadeMaterial +) + +pxr_register_test(testUsdImagingGLShadeMaterialRef + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage coloredCubes.usda -write testUsdImagingGLShadeMaterialRef.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLShadeMaterialRef.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLShadeMaterialRef +) + +pxr_register_test(testUsdImagingGLSphere + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage sphere.usda -times 1 10 -write testUsdImagingGLSphere.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLSphere_001.png + testUsdImagingGLSphere_010.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSphere +) + +pxr_register_test(testUsdImagingGLNurbsCurves + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -times 0 50 150 -stage testCurves.usda -write testUsdImagingGLNurbsCurves.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLNurbsCurves_000.png + testUsdImagingGLNurbsCurves_050.png + testUsdImagingGLNurbsCurves_150.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLNurbsCurves +) + +pxr_register_test(testUsdImagingGLNurbsCurves_refined + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -times 0 50 150 -complexity 1.1 -stage testCurves.usda -write testUsdImagingGLNurbsCurves_refined.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLNurbsCurves_refined_000.png + testUsdImagingGLNurbsCurves_refined_050.png + testUsdImagingGLNurbsCurves_refined_150.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLNurbsCurves +) + +pxr_register_test(testUsdImagingGLNurbsPatch + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -stage bendyNurbs.usda -camera /main_cam -times 1 5 10 -write testUsdImagingGLNurbsPatch.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLNurbsPatch_001.png + testUsdImagingGLNurbsPatch_005.png + testUsdImagingGLNurbsPatch_010.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLNurbsPatch +) + +pxr_register_test(testUsdImagingGLNurbsPatchRef + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -stage bendyNurbs.usda -camera /main_cam -times 1 5 10 -write testUsdImagingGLNurbsPatchRef.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLNurbsPatchRef_001.png + testUsdImagingGLNurbsPatchRef_005.png + testUsdImagingGLNurbsPatchRef_010.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLNurbsPatch + ENV + HD_ENABLED=0 +) + +pxr_register_test(testUsdImagingGLFramingBBox_proxy + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage framing.usda -write testUsdImagingGLFramingBBox_proxy.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFramingBBox_proxy.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFramingBBox +) + +pxr_register_test(testUsdImagingGLFramingBBox_proxy_render + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage framing.usda -renderPurpose show -write testUsdImagingGLFramingBBox_proxy_render.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFramingBBox_proxy_render.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFramingBBox +) + +pxr_register_test(testUsdImagingGLInstancing_instancedCubes + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage instancedCubes.usda -write testUsdImagingGLInstancing_instancedCubes.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancing_instancedCubes.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancing +) + +pxr_register_test(testUsdImagingGLInstancing_instancedCubes2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage instancedCubes2.usda -write testUsdImagingGLInstancing_instancedCubes2.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancing_instancedCubes2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancing +) + +pxr_register_test(testUsdImagingGLInstancing_instancedCubes2NoInstancing + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage instancedCubes2NoInstancing.usda -write testUsdImagingGLInstancing_instancedCubes2NoInstancing.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancing_instancedCubes2NoInstancing.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancing +) + +pxr_register_test(testUsdImagingGLInstancing_nestedInstancedCubes + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage nestedInstancedCubes.usda -write testUsdImagingGLInstancing_nestedInstancedCubes.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancing_nestedInstancedCubes.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancing +) + +pxr_register_test(testUsdImagingGLInstancing_nestedInstance + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -stage nestedInstance.usda -write testUsdImagingGLInstancing_nestedInstance.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancing_instance3.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancing +) + +pxr_register_test(testUsdImagingGLInstancing_ni_pi + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -stage ni_pi.usda -write testUsdImagingGLInstancing_ni_pi.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancing_ni_pi.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancing +) + +pxr_register_test(testUsdImagingGLInstancing_internal_ni + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -stage internal_ni.usda -write testUsdImagingGLInstancing_internal_ni.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancing_internal_ni.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancing +) + +pxr_register_test(testUsdImagingGLPickAndHighlight + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLPickAndHighlight -offscreen -frameAll -stage instance.usda -write testUsdImagingGLPickAndHighlight.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLPickAndHighlight_000.png + testUsdImagingGLPickAndHighlight_001.png + testUsdImagingGLPickAndHighlight_002.png + testUsdImagingGLPickAndHighlight_003.png + testUsdImagingGLPickAndHighlight_004.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPickAndHighlight +) + +pxr_register_test(testUsdImagingGLHighlight + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLHighlight -offscreen -frameAll -stage instance.usda -write testUsdImagingGLHighlight.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLHighlight_000.png + testUsdImagingGLHighlight_001.png + testUsdImagingGLHighlight_002.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLHighlight +) + +pxr_register_test(testUsdImagingGLHighlight_pi + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLHighlight -offscreen -frameAll -stage pi.usda -write testUsdImagingGLHighlight_pi.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLHighlight_pi_000.png + testUsdImagingGLHighlight_pi_001.png + testUsdImagingGLHighlight_pi_002.png + testUsdImagingGLHighlight_pi_003.png + testUsdImagingGLHighlight_pi_004.png + testUsdImagingGLHighlight_pi_005.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLHighlight +) + +pxr_register_test(testUsdImagingGLHighlight_pi_ni + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLHighlight -offscreen -frameAll -stage pi_ni.usda -write testUsdImagingGLHighlight_pi_ni.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLHighlight_pi_ni_000.png + testUsdImagingGLHighlight_pi_ni_001.png + testUsdImagingGLHighlight_pi_ni_002.png + testUsdImagingGLHighlight_pi_ni_003.png + testUsdImagingGLHighlight_pi_ni_004.png + testUsdImagingGLHighlight_pi_ni_005.png + testUsdImagingGLHighlight_pi_ni_006.png + testUsdImagingGLHighlight_pi_ni_007.png + testUsdImagingGLHighlight_pi_ni_008.png + testUsdImagingGLHighlight_pi_ni_009.png + testUsdImagingGLHighlight_pi_ni_010.png + testUsdImagingGLHighlight_pi_ni_011.png + testUsdImagingGLHighlight_pi_ni_012.png + testUsdImagingGLHighlight_pi_ni_013.png + testUsdImagingGLHighlight_pi_ni_014.png + testUsdImagingGLHighlight_pi_ni_015.png + testUsdImagingGLHighlight_pi_ni_016.png + testUsdImagingGLHighlight_pi_ni_017.png + testUsdImagingGLHighlight_pi_ni_018.png + testUsdImagingGLHighlight_pi_ni_019.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLHighlight +) + +pxr_register_test(testUsdImagingGLSurfaceShader_1_2_5 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLSurfaceShader -offscreen -frameAll -stage shader_change.usda -lighting" + IMAGE_DIFF_COMPARE + out1.png + out2.png + out5.png + FAIL 1 + FAIL_PERCENT 1.5 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSurfaceShader +) + +pxr_register_test(testUsdImagingGLSurfaceShader_3_4 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLSurfaceShader -offscreen -frameAll -stage shader_change.usda -lighting" + IMAGE_DIFF_COMPARE + out3.png + out4.png + FAIL 0.01 + FAIL_PERCENT 0.001 + WARN 0.02 + WARN_PERCENT 0.0005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSurfaceShader +) + +pxr_register_test(testUsdImagingGLShadeBadTexture + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLSurfaceShader -offscreen -frameAll -stage shader_change.usda -lighting" + IMAGE_DIFF_COMPARE + out1.png + out2.png + out3.png + out4.png + out5.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLShadeBadTexture +) + +pxr_register_test(testUsdImagingGLShadeBool + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLSurfaceShader -offscreen -frameAll -stage shadebool.usda -lighting" + IMAGE_DIFF_COMPARE + out1.png + out2.png + out3.png + out4.png + out5.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLShadeBool +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_basic + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_basic.usda -times 1 2 -write pi_basic.png" + IMAGE_DIFF_COMPARE + pi_basic_001.png + pi_basic_002.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi.usda -write pi.png" + IMAGE_DIFF_COMPARE + pi.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_pi + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_pi.usda -write pi_pi.png" + IMAGE_DIFF_COMPARE + pi_pi.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_pi2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_pi2.usda -write pi_pi2.png" + IMAGE_DIFF_COMPARE + pi_pi2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_ni_pi + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage ni_pi.usda -write ni_pi.png" + IMAGE_DIFF_COMPARE + ni_pi.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_ni + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_ni.usda -write pi_ni.png" + IMAGE_DIFF_COMPARE + pi_ni.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_ni2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_ni2.usda -write pi_ni2.png" + IMAGE_DIFF_COMPARE + pi_ni2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_ni_pi + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_ni_pi.usda -write pi_ni_pi.png" + IMAGE_DIFF_COMPARE + pi_ni_pi.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_root_prototype + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_root_prototype.usda -write pi_root_prototype.png" + IMAGE_DIFF_COMPARE + pi_root_prototype.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_sibling_prototype + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_sibling_prototype.usda -write pi_sibling_prototype.png" + IMAGE_DIFF_COMPARE + pi_sibling_prototype.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_sibling_pi + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_sibling_pi.usda -write pi_sibling_pi.png" + IMAGE_DIFF_COMPARE + pi_sibling_pi.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_varying + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -translate 0 -10 -40 -clear 0.2 0.2 0.2 1 -stage pi_varying.usda -times 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 18 19 20 21 22 23 24 25 26 27 28 29 30 -write pi_varying.png" + IMAGE_DIFF_COMPARE + pi_varying_000.png + pi_varying_001.png + pi_varying_002.png + pi_varying_003.png + pi_varying_004.png + pi_varying_005.png + pi_varying_006.png + pi_varying_007.png + pi_varying_008.png + pi_varying_009.png + pi_varying_010.png + pi_varying_011.png + pi_varying_012.png + pi_varying_013.png + pi_varying_014.png + pi_varying_015.png + pi_varying_018.png + pi_varying_019.png + pi_varying_020.png + pi_varying_021.png + pi_varying_022.png + pi_varying_023.png + pi_varying_024.png + pi_varying_025.png + pi_varying_026.png + pi_varying_027.png + pi_varying_028.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_pi_varying + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -translate 0 -10 -40 -clear 0.2 0.2 0.2 1 -stage pi_pi_varying.usda -times 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 -write pi_pi_varying.png" + IMAGE_DIFF_COMPARE + pi_pi_varying_000.png + pi_pi_varying_001.png + pi_pi_varying_002.png + pi_pi_varying_003.png + pi_pi_varying_004.png + pi_pi_varying_005.png + pi_pi_varying_006.png + pi_pi_varying_007.png + pi_pi_varying_008.png + pi_pi_varying_009.png + pi_pi_varying_010.png + pi_pi_varying_011.png + pi_pi_varying_012.png + pi_pi_varying_013.png + pi_pi_varying_014.png + pi_pi_varying_015.png + pi_pi_varying_016.png + pi_pi_varying_017.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_pi_time + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -translate 0 -10 -40 -clear 0.2 0.2 0.2 1 -stage pi_pi_time.usda -times 0 1 2 -write pi_pi_time.png" + IMAGE_DIFF_COMPARE + pi_pi_time_000.png + pi_pi_time_001.png + pi_pi_time_002.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_masking + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_masking.usda -times 0 1 2 3 4 -write pi_masking.png" + IMAGE_DIFF_COMPARE + pi_masking_000.png + pi_masking_001.png + pi_masking_002.png + pi_masking_003.png + pi_masking_004.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_bad_schema_input + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_bad_schema_input.usda -write pi_bad_schema_input.png" + IMAGE_DIFF_COMPARE + pi_bad_schema_input.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_ni_material + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_ni_material.usda -write pi_ni_material.png" + IMAGE_DIFF_COMPARE + pi_ni_material.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLPointInstancer_pi_ni_material2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -stage pi_ni_material2.usda -write pi_ni_material2.png" + IMAGE_DIFF_COMPARE + pi_ni_material2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPointInstancer +) + +pxr_register_test(testUsdImagingGLResync + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLResync --stage world.usda --unload /World/Model --write world.png" + IMAGE_DIFF_COMPARE + world_0.png + world_1.png + world_2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLResync +) + +pxr_register_test(testUsdImagingGLResync_instancer + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLResync --stage instancer.usda --unload /Root/PI/prototypes/proto1 --write instancer.png" + IMAGE_DIFF_COMPARE + instancer_0.png + instancer_1.png + instancer_2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLResync +) + +pxr_register_test(testUsdImagingGLPurpose + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLPurpose --stage world.usda --purpose /World/Model --write world.png" + IMAGE_DIFF_COMPARE + world_0.png + world_1.png + world_2.png + world_3.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPurpose +) + +pxr_register_test(testUsdImagingGLPrimvarSharing + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -frameAll -stage primvar_sharing.usda -times 0 1 2 -write default.png" + IMAGE_DIFF_COMPARE + default_000.png + default_001.png + default_002.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPrimvarSharing + ENV + HDST_ENABLE_SHARED_VERTEX_PRIMVAR=1 +) + +pxr_register_test(testUsdImagingGLPrimvarSharing_refined + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -complexity 1.1 -lighting -camlight -frameAll -stage primvar_sharing.usda -times 0 1 2 -write refined.png" + IMAGE_DIFF_COMPARE + refined_000.png + refined_001.png + refined_002.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPrimvarSharing + ENV + HDST_ENABLE_SHARED_VERTEX_PRIMVAR=1 +) + +pxr_register_test(testUsdImagingGLPrimvarSharing_colors + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage primvar_sharing_colors.usda -times 0 1 2 -write default_colors.png" + IMAGE_DIFF_COMPARE + default_colors_000.png + default_colors_001.png + default_colors_002.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPrimvarSharing + ENV + HDST_ENABLE_SHARED_VERTEX_PRIMVAR=1 +) + +pxr_register_test(testUsdImagingGLPrimvarSharing_refined_colors + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -complexity 1.1 -frameAll -stage primvar_sharing_colors.usda -times 0 1 2 -write refined_colors.png" + IMAGE_DIFF_COMPARE + refined_colors_000.png + refined_colors_001.png + refined_colors_002.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPrimvarSharing + ENV + HDST_ENABLE_SHARED_VERTEX_PRIMVAR=1 +) + +pxr_register_test(testUsdImagingGLColorOpacityPrimvar + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -translate -5 -2 -25 -times 0 1 -stage color_opacity_primvar.usda -write color_opacity_primvar.png" + IMAGE_DIFF_COMPARE + color_opacity_primvar_000.png + color_opacity_primvar_001.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLColorOpacityPrimvar +) + +pxr_register_test(testUsdImagingGLTriangleSubdivisionRuleOsd3 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -complexity 1.5 -stage catmark_and_smooth_tris.usda -write testUsdImagingGLTriangleSubdivisionRuleOsd3.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLTriangleSubdivisionRuleOsd3.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLTriangleSubdivisionRuleOsd3 +) + +pxr_register_test(testUsdImagingGLWireframeOpacity + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -shading wire -frameAll -complexity 1 -stage wireframe_opacity.usda -write testUsdImagingGLWireframeOpacity.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLWireframeOpacity.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLWireframeOpacity +) + +pxr_register_test(testUsdImagingGLCards + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testCards.usda -write testCards.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLWireframeOpacity.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLCards +) + +pxr_register_test(testUsdImagingGLCards_anim + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testAnim.usda -times 1 2 -write testAnim.png" + IMAGE_DIFF_COMPARE + testAnim_001.png + testAnim_002.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLCards +) + +pxr_register_test(testUsdImagingGLCards_bounds + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -unloadedAsBounds -offscreen -lighting -shading smooth -frameAll -stage testUnloadedAsBounds.usda -write testUnloadedAsBounds.png" + IMAGE_DIFF_COMPARE + testUnloadedAsBounds.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLCards +) + +pxr_register_test(testUsdImagingGLMeshQuadrangulation + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -shading wireOnSurface -frameAll -stage meshQuadrangulation.usda -write testUsdImagingGLMeshQuadrangulation_default.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLMeshQuadrangulation_default.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMeshQuadrangulation + ENV + HD_ENABLE_FORCE_QUADRANGULATE=1 +) + +pxr_register_test(testUsdImagingGLMeshQuadrangulation_refined + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -shading wireOnSurface -frameAll -stage meshQuadrangulation.usda -complexity 1.1 -write testUsdImagingGLMeshQuadrangulation_refined.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLMeshQuadrangulation_refined.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMeshQuadrangulation + ENV + HD_ENABLE_FORCE_QUADRANGULATE=1 +) + +pxr_register_test(testUsdImagingGLSkeleton + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -shading wire -stage skeleton.usda -times 1 2 3 -write skeleton.png" + IMAGE_DIFF_COMPARE + skeleton_001.png + skeleton_002.png + skeleton_003.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSkeleton +) + +pxr_register_test(testUsdImagingGLSkelBlendShapes + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage blendshapes.usda -times 1 2 3 -write blendshapes.png" + IMAGE_DIFF_COMPARE + blendshapes_001.png + blendshapes_002.png + blendshapes_003.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSkelBlendShapes +) + +pxr_register_test(testUsdImagingGLNormals + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testNormals.usda -write testNormals.png" + IMAGE_DIFF_COMPARE + testNormals.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLNormals +) + +pxr_register_test(testUsdImagingGLPreviewSurface_Fallback + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceFallback.usda -write testPreviewSurfaceFallback.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceFallback.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_Primvars + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfacePrimvars.usda -write testPreviewSurfacePrimvars.png" + IMAGE_DIFF_COMPARE + testPreviewSurfacePrimvars.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_Specular + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceSpecular.usda -write testPreviewSurfaceSpecular.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceSpecular.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_MaterialInterface + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceMaterialInterface.usda -write testPreviewSurfaceMaterialInterface.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceMaterialInterface.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_Texture + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTexture.usda -write testPreviewSurfaceTexture.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTexture.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_Translucent + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -cullStyle back -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTranslucent.usda -write testPreviewSurfaceTranslucent.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTranslucent.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_Displacement + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -complexity 1.4 -stage testPreviewSurfaceDisplacement.usda -write testPreviewSurfaceDisplacement.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceDisplacement.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_TextureOpacity + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTextureOpacity.usda -write testPreviewSurfaceTextureOpacity.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTextureOpacity.png + FAIL 0.05 + FAIL_PERCENT 0.001 + WARN 0.05 + WARN_PERCENT 0.0005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_TextureScaleAndBias + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTextureScaleAndBias.usda -write testPreviewSurfaceTextureScaleAndBias.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTextureScaleAndBias.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_Transform2d + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTransform2d.usda -write testPreviewSurfaceTransform2d.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTransform2d.png + FAIL 0.01 + FAIL_PERCENT 3.5 + WARN 0.02 + WARN_PERCENT 0.1 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_SourceColorSpace + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceSourceColorSpace.usda -write testPreviewSurfaceSourceColorSpace.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceSourceColorSpace.png + FAIL 0.005 + FAIL_PERCENT 0.001 + WARN 0.005 + WARN_PERCENT 0.0005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_NormalMap + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceNormalMap.usda -write testPreviewSurfaceNormalMap.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceNormalMap.png + FAIL 0.01 + FAIL_PERCENT 0.5 + WARN 0.1 + WARN_PERCENT 0.0005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + + +pxr_register_test(testUsdImagingGLPreviewSurface_OpacityThreshold + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceOpacityThreshold.usda -write testPreviewSurfaceOpacityThreshold.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceOpacityThreshold.png + FAIL 0.005 + FAIL_PERCENT 0.05 + WARN 0.005 + WARN_PERCENT 0.03 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLPreviewSurface_Animated + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -times 1 2 3 4 -shading smooth -frameAll -stage testPreviewSurfaceAnimated.usda -write testPreviewSurfaceAnimated.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceAnimated_001.png + testPreviewSurfaceAnimated_002.png + testPreviewSurfaceAnimated_003.png + testPreviewSurfaceAnimated_004.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLPreviewSurface_FallbackPrimvar + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceFallbackPrimvar.usda -write testPreviewSurfaceFallbackPrimvar.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceFallbackPrimvar.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLPreviewSurface_FallbackTexture + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceFallbackTexture.usda -write testPreviewSurfaceFallbackTexture.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceFallbackTexture.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLPreviewSurface_PrimvarFallback + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfacePrimvarFallback.usda -write testPreviewSurfacePrimvarFallback.png" + IMAGE_DIFF_COMPARE + testPreviewSurfacePrimvarFallback.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLPreviewSurface_TextureFallback + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTextureFallback.usda -write testPreviewSurfaceTextureFallback.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTextureFallback.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLPreviewSurface_TextureNoFile + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTextureNoFile.usda -write testPreviewSurfaceTextureNoFile.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTextureNoFile.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLPreviewSurface_TextureWithToken + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTextureWithToken.usda -write testPreviewSurfaceTextureWithToken.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTextureWithToken.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_Fallback + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceFallback.usda -write testPreviewSurfaceFallback.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceFallback.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_Primvars + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfacePrimvars.usda -write testPreviewSurfacePrimvars.png" + IMAGE_DIFF_COMPARE + testPreviewSurfacePrimvars.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_Specular + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceSpecular.usda -write testPreviewSurfaceSpecular.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceSpecular.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_MaterialInterface + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceMaterialInterface.usda -write testPreviewSurfaceMaterialInterface.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceMaterialInterface.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_Texture + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTexture.usda -write testPreviewSurfaceTexture.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTexture.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_Translucent + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -cullStyle back -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTranslucent.usda -write testPreviewSurfaceTranslucent.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTranslucent.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_Displacement + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -complexity 1.4 -stage testPreviewSurfaceDisplacement.usda -write testPreviewSurfaceDisplacement.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceDisplacement.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_TextureOpacity + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTextureOpacity.usda -write testPreviewSurfaceTextureOpacity.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTextureOpacity.png + FAIL 0.05 + FAIL_PERCENT 0.001 + WARN 0.05 + WARN_PERCENT 0.0005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_TextureScaleAndBias + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTextureScaleAndBias.usda -write testPreviewSurfaceTextureScaleAndBias.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTextureScaleAndBias.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_Transform2d + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTransform2d.usda -write testPreviewSurfaceTransform2d.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTransform2d.png + FAIL 0.01 + FAIL_PERCENT 3.5 + WARN 0.02 + WARN_PERCENT 0.1 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_SourceColorSpace + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceSourceColorSpace.usda -write testPreviewSurfaceSourceColorSpace.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceSourceColorSpace.png + FAIL 0.005 + FAIL_PERCENT 0.001 + WARN 0.005 + WARN_PERCENT 0.0005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_NormalMap + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceNormalMap.usda -write testPreviewSurfaceNormalMap.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceNormalMap.png + FAIL 0.01 + FAIL_PERCENT 0.5 + WARN 0.1 + WARN_PERCENT 0.0005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_OpacityThreshold + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceOpacityThreshold.usda -write testPreviewSurfaceOpacityThreshold.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceOpacityThreshold.png + FAIL 0.005 + FAIL_PERCENT 0.05 + WARN 0.005 + WARN_PERCENT 0.03 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_Animated + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -times 1 2 3 4 -shading smooth -frameAll -stage testPreviewSurfaceAnimated.usda -write testPreviewSurfaceAnimated.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceAnimated_001.png + testPreviewSurfaceAnimated_002.png + testPreviewSurfaceAnimated_003.png + testPreviewSurfaceAnimated_004.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_FallbackPrimvar + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceFallbackPrimvar.usda -write testPreviewSurfaceFallbackPrimvar.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceFallbackPrimvar.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_FallbackTexture + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceFallbackTexture.usda -write testPreviewSurfaceFallbackTexture.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceFallbackTexture.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_PrimvarFallback + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfacePrimvarFallback.usda -write testPreviewSurfacePrimvarFallback.png" + IMAGE_DIFF_COMPARE + testPreviewSurfacePrimvarFallback.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_TextureFallback + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTextureFallback.usda -write testPreviewSurfaceTextureFallback.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTextureFallback.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_TextureNoFile + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTextureNoFile.usda -write testPreviewSurfaceTextureNoFile.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTextureNoFile.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + + +pxr_register_test(testUsdImagingGLPreviewSurfaceNonBindless_TextureWithToken + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPreviewSurfaceTextureWithToken.usda -write testPreviewSurfaceTextureWithToken.png" + IMAGE_DIFF_COMPARE + testPreviewSurfaceTextureWithToken.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPreviewSurface + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + +pxr_register_test(testUsdImagingGLPremultiplyAlpha + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPremultiplyAlpha.usda -write testPremultiplyAlpha.png" + IMAGE_DIFF_COMPARE + testPremultiplyAlpha.png + FAIL 0.01 + FAIL_PERCENT 0.75 + WARN 0.01 + WARN_PERCENT 0.72 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPremultiplyAlpha +) + +pxr_register_test(testUsdImagingGLPremultiplyAlpha_udims + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPremultiplyAlphaUdims.usda -write testPremultiplyAlphaUdims.png" + IMAGE_DIFF_COMPARE + testPremultiplyAlphaUdims.png + FAIL 0.01 + FAIL_PERCENT 0.75 + WARN 0.01 + WARN_PERCENT 0.66 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPremultiplyAlpha +) + +pxr_register_test(testUsdImagingGLInstancingWithMaterials_ni_2instances + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage ni_2instances.usda -write testUsdImagingGLInstancingWithMaterials_ni_2instances.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancingWithMaterials_ni_2instances.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancingWithMaterials +) + + +pxr_register_test(testUsdImagingGLInstancingWithMaterials_ni_2instances_per_instance_overrides_noshading + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage ni_2instances_per_instance_overrides_noshading.usda -write testUsdImagingGLInstancingWithMaterials_ni_2instances_per_instance_overrides_noshading.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancingWithMaterials_ni_2instances_per_instance_overrides_noshading.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancingWithMaterials +) + + +pxr_register_test(testUsdImagingGLInstancingWithMaterials_ni_2instances_shaded + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage ni_2instances_shaded.usda -write testUsdImagingGLInstancingWithMaterials_ni_2instances_shaded.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancingWithMaterials_ni_2instances_shaded.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancingWithMaterials +) + + +pxr_register_test(testUsdImagingGLInstancingWithMaterials_ni_2instances_shaded_overrides + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage ni_2instances_shaded_overrides.usda -write testUsdImagingGLInstancingWithMaterials_ni_2instances_shaded_overrides.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancingWithMaterials_ni_2instances_shaded_overrides.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancingWithMaterials +) + + +pxr_register_test(testUsdImagingGLInstancingWithMaterials_ni_2instances_shaded_overrides_noshading + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage ni_2instances_shaded_overrides_noshading.usda -write testUsdImagingGLInstancingWithMaterials_ni_2instances_shaded_overrides_noshading.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancingWithMaterials_ni_2instances_shaded_overrides_noshading.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancingWithMaterials +) + +pxr_register_test(testUsdImagingGLFaceVarying_Uniform_Low + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLFaceVarying.usda -write testUsdImagingGLFaceVarying_Uniform_Low.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFaceVarying_Uniform_Low.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFaceVarying +) + + +pxr_register_test(testUsdImagingGLFaceVarying_Uniform_Medium + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.2 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLFaceVarying.usda -write testUsdImagingGLFaceVarying_Uniform_Medium.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFaceVarying_Uniform_Medium.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFaceVarying +) + + +pxr_register_test(testUsdImagingGLFaceVaryingLinearInterp_Uniform_Low + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLFaceVaryingLinearInterp.usda -write testUsdImagingGLFaceVaryingLinearInterp_Uniform_Low.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFaceVaryingLinearInterp_Uniform_Low.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFaceVarying +) + + +pxr_register_test(testUsdImagingGLFaceVaryingLinearInterp_Uniform_Medium + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.2 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLFaceVaryingLinearInterp.usda -write testUsdImagingGLFaceVaryingLinearInterp_Uniform_Medium.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFaceVaryingLinearInterp_Uniform_Medium.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFaceVarying +) + + +pxr_register_test(testUsdImagingGLFaceVaryingLeftHanded_Uniform_None + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.0 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLFaceVaryingLeftHanded.usda -write testUsdImagingGLFaceVaryingLeftHanded_Uniform_None.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFaceVaryingLeftHanded_Uniform_None.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFaceVarying +) + + +pxr_register_test(testUsdImagingGLFaceVaryingLeftHanded_Uniform_Low + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLFaceVaryingLeftHanded.usda -write testUsdImagingGLFaceVaryingLeftHanded_Uniform_Low.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFaceVaryingLeftHanded_Uniform_Low.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFaceVarying +) + +pxr_register_test(testUsdImagingGLFaceVarying_Adaptive_Low + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLFaceVarying.usda -write testUsdImagingGLFaceVarying_Adaptive_Low.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFaceVarying_Adaptive_Low.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFaceVarying + ENV + HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1 +) + + +pxr_register_test(testUsdImagingGLFaceVarying_Adaptive_Medium + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.2 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLFaceVarying.usda -write testUsdImagingGLFaceVarying_Adaptive_Medium.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFaceVarying_Adaptive_Medium.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFaceVarying + ENV + HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1 +) + + +pxr_register_test(testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Low + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLFaceVaryingLinearInterp.usda -write testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Low.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Low.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFaceVarying + ENV + HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1 +) + + +pxr_register_test(testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Medium + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.2 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLFaceVaryingLinearInterp.usda -write testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Medium.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFaceVaryingLinearInterp_Adaptive_Medium.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFaceVarying + ENV + HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1 +) + + +pxr_register_test(testUsdImagingGLFaceVaryingLeftHanded_Adaptive_Low + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLFaceVaryingLeftHanded.usda -write testUsdImagingGLFaceVaryingLeftHanded_Adaptive_Low.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFaceVaryingLeftHanded_Adaptive_Low.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFaceVarying + ENV + HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1 +) + +pxr_register_test(testUsdImagingGLShadingPrimvars + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage testPrimvarNameHandlingInGL.usda -write testUsdImagingGLShadingPrimvars.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLShadingPrimvars.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLShadingPrimvars + ENV + HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1 +) + +# The following tests are disabled since the stages are unable to load any .tx files +# In theory these image files should be able to load through the hioOiio plugin but I have not +# been able to get that too work. I did try to convert these images through OIIO's iconvert tool +# but it also fails trying to open the .tx files +#pxr_register_test(testUsdImagingGLTextureWrap +# COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage textureWrap.usda -write textureWrap.png" +# IMAGE_DIFF_COMPARE +# textureWrap.png +# FAIL 1 +# FAIL_PERCENT 1 +# PERCEPTUAL +# EXPECTED_RETURN_CODE 0 +# TESTENV testUsdImagingGLTextureWrap +# ENV +# HGIGL_ENABLE_BINDLESS_TEXTURE=1 +#) +# +#pxr_register_test(testUsdImagingGLTextureWrapNonBindless +# COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage textureWrap.usda -write textureWrap.png" +# IMAGE_DIFF_COMPARE +# textureWrap.png +# FAIL 1 +# FAIL_PERCENT 1 +# PERCEPTUAL +# EXPECTED_RETURN_CODE 0 +# TESTENV testUsdImagingGLTextureWrap +# ENV +# HGIGL_ENABLE_BINDLESS_TEXTURE=0 +#) + +pxr_register_test(testUsdImagingGLUsdLux + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage usdLux.usda -write usdLux.png" + IMAGE_DIFF_COMPARE + usdLux.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdLux +) + +# TODO: Requires create_symlinks.py to run properly +#pxr_register_test(testUsdImagingGLUsdUdims_Symlinked +# COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage usdUdimsSymlinked.usda -write usdUdimsSymlinked.png" +# IMAGE_DIFF_COMPARE +# usdUdimsSymlinked.png +# FAIL_PERCENT 1 +# PERCEPTUAL +# EXPECTED_RETURN_CODE 0 +# TESTENV testUsdImagingGLUsdUdims +# ENV +# HGIGL_ENABLE_BINDLESS_TEXTURE=1 +#) + +pxr_register_test(testUsdImagingGLUsdUdims + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage usdUdims.usda -write usdUdims.png" + IMAGE_DIFF_COMPARE + usdUdims.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdUdims + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLUsdUdims_Usdz + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage usdUdims.usdz -write usdUdimsUsdz.png" + IMAGE_DIFF_COMPARE + usdUdimsUsdz.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdUdims + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLUsdUdims_ScaleAndBias + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage usdUdimsScaleAndBias.usda -write usdUdimsScaleAndBias.png" + IMAGE_DIFF_COMPARE + usdUdimsScaleAndBias.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdUdims + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +pxr_register_test(testUsdImagingGLUsdUdims_TextureFallback + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage usdUdimsTextureFallback.usda -write usdUdimsTextureFallback.png" + IMAGE_DIFF_COMPARE + usdUdimsTextureFallback.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdUdims + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 +) + +# TODO: Requires create_symlinks.py to run properly +#pxr_register_test(testUsdImagingGLUsdUdimsNonBindless_Symlinked +# COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage usdUdimsSymlinked.usda -write usdUdimsSymlinked.png" +# IMAGE_DIFF_COMPARE +# usdUdimsSymlinked.png +# FAIL_PERCENT 1 +# PERCEPTUAL +# EXPECTED_RETURN_CODE 0 +# TESTENV testUsdImagingGLUsdUdimsNonBindless +# ENV +# HGIGL_ENABLE_BINDLESS_TEXTURE=0 +#) + +pxr_register_test(testUsdImagingGLUsdUdimsNonBindless + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage usdUdims.usda -write usdUdims.png" + IMAGE_DIFF_COMPARE + usdUdims.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdUdims + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + +pxr_register_test(testUsdImagingGLUsdUdimsNonBindless_ScaleAndBias + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage usdUdimsScaleAndBias.usda -write usdUdimsScaleAndBias.png" + IMAGE_DIFF_COMPARE + usdUdimsScaleAndBias.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdUdims + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + +pxr_register_test(testUsdImagingGLUsdUdimsNonBindless_TextureFallback + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -stage usdUdimsTextureFallback.usda -write usdUdimsTextureFallback.png" + IMAGE_DIFF_COMPARE + usdUdimsTextureFallback.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdUdims + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 +) + +pxr_register_test(testUsdImagingGLUsdSkelExtCompCPU_arm_baked + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -shading wireOnSurface -stage arm_baked.usda -times 1 3 7 -write usdSkel_arm_baked.png" + IMAGE_DIFF_COMPARE + usdSkel_arm_baked_001.png + usdSkel_arm_baked_003.png + usdSkel_arm_baked_007.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdSkel + ENV + USDSKELIMAGING_FORCE_CPU_COMPUTE=1 +) + +pxr_register_test(testUsdImagingGLUsdSkelExtCompCPU_arm + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -shading wireOnSurface -stage arm.usda -times 1 3 7 -write usdSkel_arm_extComp_CPU.png" + IMAGE_DIFF_COMPARE + usdSkel_arm_extComp_CPU_001.png + usdSkel_arm_extComp_CPU_003.png + usdSkel_arm_extComp_CPU_007.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdSkel + ENV + USDSKELIMAGING_FORCE_CPU_COMPUTE=1 +) + +pxr_register_test(testUsdImagingGLUsdSkelExtCompCPU_twoBends + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -shading wireOnSurface -stage twoBends.usda -write usdSkel_twoBends_extComp_CPU.png" + IMAGE_DIFF_COMPARE + usdSkel_twoBends_extComp_CPU.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdSkel + ENV + USDSKELIMAGING_FORCE_CPU_COMPUTE=1 +) + +pxr_register_test(testUsdImagingGLUsdSkelExtCompGPU_arm_baked + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -shading wireOnSurface -stage arm_baked.usda -times 1 3 7 -write usdSkel_arm_baked.png" + IMAGE_DIFF_COMPARE + usdSkel_arm_baked_001.png + usdSkel_arm_baked_003.png + usdSkel_arm_baked_007.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdSkel + ENV + USDSKELIMAGING_FORCE_CPU_COMPUTE=0 +) + +pxr_register_test(testUsdImagingGLUsdSkelExtCompGPU_arm + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -shading wireOnSurface -stage arm.usda -times 1 3 7 -write usdSkel_arm_extComp_GPU.png" + IMAGE_DIFF_COMPARE + usdSkel_arm_extComp_GPU_001.png + usdSkel_arm_extComp_GPU_003.png + usdSkel_arm_extComp_GPU_007.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdSkel + ENV + USDSKELIMAGING_FORCE_CPU_COMPUTE=0 +) + +pxr_register_test(testUsdImagingGLUsdSkelExtCompGPU_twoBends + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -camlight -shading wireOnSurface -stage twoBends.usda -write usdSkel_twoBends_extComp_GPU.png" + IMAGE_DIFF_COMPARE + usdSkel_twoBends_extComp_GPU.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLUsdSkel + ENV + USDSKELIMAGING_FORCE_CPU_COMPUTE=0 +) + +pxr_register_test(testUsdImagingGLPopOut + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLPopOut --output test test.usda" + IMAGE_DIFF_COMPARE + test_0.png + test_1.png + test_2.png + test_3.png + test_4.png + test_5.png + test_6.png + test_7.png + test_8.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPopOut +) + +pxr_register_test(testUsdImagingGLPopOut_instance + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLPopOut --output test_instance test_instance.usda" + IMAGE_DIFF_COMPARE + test_instance_0.png + test_instance_1.png + test_instance_2.png + test_instance_3.png + test_instance_4.png + test_instance_5.png + test_instance_6.png + test_instance_7.png + test_instance_8.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPopOut +) + +pxr_register_test(testUsdImagingGLPopOut_instance_empty + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLPopOut --output test_instance_empty test_instance_empty.usda" + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPopOut +) + +pxr_register_test(testUsdImagingGLMaterialTag + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -cullStyle back -offscreen -frameAll -stage materialTag.usda -write testUsdImagingGLMaterialTag.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLMaterialTag.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialTag +) + +if (MATERIALX_FOUND AND ${PXR_ENABLE_MATERIALX_SUPPORT}) + pxr_register_test(testUsdImagingGLMaterialX_mxSimple + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxSimple.usda -write mxSimple.png" + IMAGE_DIFF_COMPARE + mxSimple.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.0075 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + pxr_register_test(testUsdImagingGLMaterialX_standardSurface + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage standardSurface.usda -write standardSurface.png" + IMAGE_DIFF_COMPARE + standardSurface.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.2 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_standardSurfaceMarble + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage standardSurfaceMarble.usda -write standardSurfaceMarble.png" + IMAGE_DIFF_COMPARE + standardSurfaceMarble.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_usdPreviewSurface + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage usdPreviewSurface.usda -write usdPreviewSurface.png" + IMAGE_DIFF_COMPARE + usdPreviewSurface.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.06 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_mxPreviewSurfaceVsNative_Default + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxPreviewSurfaceVsNative_Default.usda -write mxPreviewSurfaceVsNative_Default.png" + IMAGE_DIFF_COMPARE + mxPreviewSurfaceVsNative_Default.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.0075 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_mxPreviewSurfaceVsNative_Gold + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxPreviewSurfaceVsNative_Gold.usda -write mxPreviewSurfaceVsNative_Gold.png" + IMAGE_DIFF_COMPARE + mxPreviewSurfaceVsNative_Gold.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.6 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_basicMxYup + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -stage basicMxYup.usda -camera /FrontCamera -write basicMxYup.png" + IMAGE_DIFF_COMPARE + basicMxYup.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.0025 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_basicMxZup + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -stage basicMxZup.usda -camera /FrontCamera -write basicMxZup.png" + IMAGE_DIFF_COMPARE + basicMxZup.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.0025 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_mxDirectLights + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxDirectLights.usda -write mxDirectLights.png" + IMAGE_DIFF_COMPARE + mxDirectLights.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.0025 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_mxDirectLightsCameraLight + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -camlight -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxDirectLights.usda -write mxDirectLightsCameraLight.png" + IMAGE_DIFF_COMPARE + mxDirectLightsCameraLight.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.0025 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_mxTextured + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTextured.usda -write mxTextured.png" + IMAGE_DIFF_COMPARE + mxTextured.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.05 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_mxTextured2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxTextured2.usda -write mxTextured2.png" + IMAGE_DIFF_COMPARE + mxTextured2.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.0025 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_mxGlass + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxGlass.usda -write mxGlass.png" + IMAGE_DIFF_COMPARE + mxGlass.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) + + + pxr_register_test(testUsdImagingGLMaterialX_mxGeomprop + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -sceneLights -shading smooth -complexity 1.3 -offscreen -frameAll -stage mxGeomprop.usda -write mxGeomprop.png" + IMAGE_DIFF_COMPARE + mxGeomprop.png + FAIL 0.5 + FAIL_PERCENT 0.005 + WARN 0.05 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLMaterialX + ) +endif() + +pxr_register_test(testUsdImagingGLInstancePrimvars + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage test.usda -write testUsdImagingGLInstancePrimvars.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancePrimvars.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancePrimvars +) + +pxr_register_test(testUsdImagingGLInstancePrimvars_Filtering + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -stage testFiltering.usda -write testUsdImagingGLInstancePrimvarsFiltering.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancePrimvarsFiltering.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancePrimvars +) + +pxr_register_test(testUsdImagingGLInstancePrimvars_Animated + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -times 1 2 3 -stage testAnimated.usda -write testUsdImagingGLInstancePrimvarsAnimated.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancePrimvarsAnimated_001.png + testUsdImagingGLInstancePrimvarsAnimated_002.png + testUsdImagingGLInstancePrimvarsAnimated_003.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancePrimvars +) + +pxr_register_test(testUsdImagingGLSimpleVolumes + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage simpleVolumes.usda -write testUsdImagingGLSimpleVolumes.png -clear 0 0 0 1 -lighting -camera /main_cam -renderSetting volumeRaymarchingStepSize float 0.04 -renderSetting volumeRaymarchingStepSizeLighting float 0.05" + IMAGE_DIFF_COMPARE + testUsdImagingGLSimpleVolumes.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSimpleVolumes +) + +pxr_register_test(testUsdImagingGLSimpleVolumes_Glow + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage simpleVolumeGlow.usda -write testUsdImagingGLSimpleVolumeGlow.png -clear 0 0 0 1 -lighting -camera /main_cam -renderSetting volumeRaymarchingStepSize float 0.05 -renderSetting volumeRaymarchingStepSizeLighting float 0.05" + IMAGE_DIFF_COMPARE + testUsdImagingGLSimpleVolumeGlow.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSimpleVolumes +) + +pxr_register_test(testUsdImagingGLVolumeMaterial + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage volumeMaterial.usda -write testUsdImagingGLVolumeMaterial.png -clear 0 0 0 1 -lighting -camera /main_cam -renderSetting volumeRaymarchingStepSize float 0.05 -renderSetting volumeRaymarchingStepSizeLighting float 0.05" + IMAGE_DIFF_COMPARE + testUsdImagingGLVolumeMaterial.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVolumeMaterial +) + +pxr_register_test(testUsdImagingGLBasisCurvesVaryingTopology + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -frameAll -offscreen -lighting -times 1 3 4 5 4 -stage bunnyCurves.usda -write testUsdImagingGLBasisCurvesVaryingTopology.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasisCurvesVaryingTopology_003.png + testUsdImagingGLBasisCurvesVaryingTopology_004.png + testUsdImagingGLBasisCurvesVaryingTopology_005.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasisCurvesVaryingTopology +) + +pxr_register_test(testUsdImagingGLAnimatedCamera + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -camera /World/main_cam -times 1 2 3 -stage cameraMoving.usda -write testUsdImagingGLAnimatedCamera.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLAnimatedCamera_001.png + testUsdImagingGLAnimatedCamera_002.png + testUsdImagingGLAnimatedCamera_003.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLAnimatedCamera +) + +pxr_register_test(testUsdImagingGLAnimatedLights + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -times 1 2 3 -stage lightMoving.usda -write testUsdImagingGLAnimatedLights.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLAnimatedLights_001.png + testUsdImagingGLAnimatedLights_002.png + testUsdImagingGLAnimatedLights_003.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLAnimatedLights +) + +pxr_register_test(testUsdImagingGLSdr_1 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage object.usda -write testUsdImagingGLSdr1.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLSdr1.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSdr +) + +pxr_register_test(testUsdImagingGLSdr_2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage usdGlslfxEmbedded.usda -write testUsdImagingGLSdr2.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLSdr2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLSdr +) + +pxr_register_test(testUsdImagingGLInvalidInfoId + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage invalid_infoid.usda -write testUsdImagingGLInvalidInfoId1.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInvalidInfoId1.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInvalidInfoId +) + +pxr_register_test(testUsdImagingGLInheritedPurpose_none + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_none.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInheritedPurpose_none.png + FAIL 1 + FAIL_PERCENT 2 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInheritedPurpose +) + + +pxr_register_test(testUsdImagingGLInheritedPurpose_guides + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_guides.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInheritedPurpose_guides.png + FAIL 1 + FAIL_PERCENT 2 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInheritedPurpose +) + + +pxr_register_test(testUsdImagingGLInheritedPurpose_render + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose show -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_render.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInheritedPurpose_render.png + FAIL 1 + FAIL_PERCENT 2 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInheritedPurpose +) + + +pxr_register_test(testUsdImagingGLInheritedPurpose_proxy + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_proxy.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInheritedPurpose_proxy.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInheritedPurpose +) + + +pxr_register_test(testUsdImagingGLInheritedPurpose_all + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose show -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes.usd -write testUsdImagingGLInheritedPurpose_all.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInheritedPurpose_all.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInheritedPurpose +) + +# NOTE: These 3 tests pass if we allow the perceptual test to pass if we bump up +# the FAIL_PERCENT. From the testSpecs.xml these thresholds are set to 1 +# so there might be some differences between idiff -p vs perceptualdiff +pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_none + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_none.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInheritedPurpose_none.png + FAIL 1 + FAIL_PERCENT 1.1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInheritedPurpose +) + + +pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_guides + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose hide -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_guides.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInheritedPurpose_guides.png + FAIL 1 + FAIL_PERCENT 1.25 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInheritedPurpose +) + + +pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_render + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose show -proxyPurpose hide -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_render.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInheritedPurpose_render.png + FAIL 1 + FAIL_PERCENT 1.85 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInheritedPurpose +) + + +pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_proxy + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose hide -renderPurpose hide -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_proxy.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInheritedPurpose_proxy.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInheritedPurpose +) + + +pxr_register_test(testUsdImagingGLInheritedPurpose_Instanced_all + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -guidesPurpose show -renderPurpose show -proxyPurpose show -offscreen -lighting -frameAll -stage InheritedPurposes_Instanced.usd -write testUsdImagingGLInheritedPurpose_all.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInheritedPurpose_all.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInheritedPurpose +) + +pxr_register_test(testUsdImagingGLInvalidUniversalSurface + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -frameAll -stage invalid_universal_surface.usda -write testUsdImagingGLInvalidUniversalSurface.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInvalidUniversalSurface.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInvalidUniversalSurface +) + +pxr_register_test(testUsdImagingGLNoFallbacks + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage primitives.usda -write testUsdImagingGLNoFallbacks.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLNoFallbacks.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFallbackPrimTypes +) + + +pxr_register_test(testUsdImagingGLFallbacks_1 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage fallbacks1.usda -write testUsdImagingGLFallbacks_1.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFallbacks_1.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFallbackPrimTypes +) + + +pxr_register_test(testUsdImagingGLFallbacks_2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage fallbacks2.usda -write testUsdImagingGLFallbacks_2.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFallbacks_2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFallbackPrimTypes +) + + +pxr_register_test(testUsdImagingGLFallbacks_3 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -stage fallbacks3.usda -write testUsdImagingGLFallbacks_3.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFallbacks_3.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFallbackPrimTypes +) + +pxr_register_test(testUsdImagingGLPrimvarProcessing + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -times 0 1 2 3 -stage points_widths.usda -write testUsdImagingGLPrimvarProcessing_points_widths.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLPrimvarProcessing_points_widths_000.png + testUsdImagingGLPrimvarProcessing_points_widths_001.png + testUsdImagingGLPrimvarProcessing_points_widths_002.png + testUsdImagingGLPrimvarProcessing_points_widths_003.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPrimvarProcessing +) + +pxr_register_test(testUsdImagingGLComposite + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -times 0 1 2 -stage moving_cubes.usda -camera /main_cam -clearOnce -rendererAov color -write testUsdImagingGLComposite.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLComposite_000.png + testUsdImagingGLComposite_001.png + testUsdImagingGLComposite_002.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLComposite +) + +pxr_register_test(testUsdImagingGLPresentDisabled + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -presentDisabled -offscreen -lighting -frameAll -stage sphere.usda -rendererAov color -write testUsdImagingGLPresentDisabled.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLPresentDisabled.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPresentDisabled +) + +pxr_register_test(testUsdImagingGLFraming_1 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /main_cam -dataWindow 0 0 640 480 -displayWindow 0 0 640 480 -write testUsdImagingGLFraming1.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFraming1.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming +) + + +pxr_register_test(testUsdImagingGLFraming_2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /main_cam -dataWindow 0 40 640 430 -displayWindow 0 0 1280 960 -write testUsdImagingGLFraming2.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFraming2.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming +) + + +pxr_register_test(testUsdImagingGLFraming_3 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /main_cam -dataWindow 0 0 640 480 -displayWindow 0 0 320 480 -write testUsdImagingGLFraming3.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFraming3.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming +) + + +pxr_register_test(testUsdImagingGLFraming_4 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /main_cam -dataWindow 0 0 640 480 -displayWindow 0 0 320 480 -pixelAspectRatio 1.5 -write testUsdImagingGLFraming4.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFraming4.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming +) + + +pxr_register_test(testUsdImagingGLFraming_5 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /main_cam -dataWindow 25 136 367 298 -displayWindow 50 80 320 400 -write testUsdImagingGLFraming5.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFraming5.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming +) + + +pxr_register_test(testUsdImagingGLFraming_6 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /OrthoCam -dataWindow 25 136 367 298 -displayWindow 50 80 320 400 -write testUsdImagingGLFraming6.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFraming6.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming +) + +pxr_register_test(testUsdImagingGLHWFaceCulling + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -times 0 1 2 -cullStyle backUnlessDoubleSided -shading smooth -frameAll -stage testHWFaceCulling.usda -write testHWFaceCulling.png" + IMAGE_DIFF_COMPARE + testHWFaceCulling_000.png + testHWFaceCulling_001.png + testHWFaceCulling_002.png + FAIL 0.05 + FAIL_PERCENT 0.001 + WARN 0.05 + WARN_PERCENT 0.0005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLHWFaceCulling +) + +# The following test is disabled since the stages are unable to load any .tx files +# In theory these image files should be able to load through the hioOiio plugin but I have not +# been able to get that too work. I did try to convert these images through OIIO's iconvert tool +# but it also fails trying to open the .tx files +#pxr_register_test(testUsdImagingGLMipmap +# COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage testUsdImagingGLMipmap.usda -write testUsdImagingGLMipmap.png -times 3 6 10 14 17 -clear 0 0 0 1 -lighting -camera /main_cam" +# IMAGE_DIFF_COMPARE +# testUsdImagingGLMipmap_003.png +# testUsdImagingGLMipmap_006.png +# testUsdImagingGLMipmap_010.png +# testUsdImagingGLMipmap_014.png +# testUsdImagingGLMipmap_017.png +# FAIL 0.05 +# FAIL_PERCENT 0.001 +# WARN 0.025 +# WARN_PERCENT 0.002 +# EXPECTED_RETURN_CODE 0 +# TESTENV testUsdImagingGLMipmap +#) + +pxr_register_test(testUsdImagingGLPrimvarRefinement_Uniform_Low + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLPrimvarRefinement.usda -write testUsdImagingGLPrimvarRefinement_Uniform_Low.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLPrimvarRefinement_Uniform_Low.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPrimvarRefinement +) + + +pxr_register_test(testUsdImagingGLPrimvarRefinement_Uniform_Medium + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.2 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLPrimvarRefinement.usda -write testUsdImagingGLPrimvarRefinement_Uniform_Medium.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLPrimvarRefinement_Uniform_Medium.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPrimvarRefinement +) + +pxr_register_test(testUsdImagingGLDisplacement_Uniform_VeryHigh + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.4 -offscreen -lighting -sceneLights -shading wireOnSurface -camera /Camera -stage testUsdImagingGLDisplacement.usda -write testUsdImagingGLDisplacement_Uniform_VeryHigh.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDisplacement_Uniform_VeryHigh.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDisplacement +) + +pxr_register_test(testUsdImagingGLPrimvarRefinement_Adaptive_Low + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLPrimvarRefinement.usda -write testUsdImagingGLPrimvarRefinement_Adaptive_Low.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLPrimvarRefinement_Adaptive_Low.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPrimvarRefinement + ENV + HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1 +) + + +pxr_register_test(testUsdImagingGLPrimvarRefinement_Adaptive_Medium + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.2 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLPrimvarRefinement.usda -write testUsdImagingGLPrimvarRefinement_Adaptive_Medium.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLPrimvarRefinement_Adaptive_Medium.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLPrimvarRefinement + ENV + HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1 +) + +pxr_register_test(testUsdImagingGLDisplacement_Adaptive_VeryHigh + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.4 -offscreen -lighting -sceneLights -shading wireOnSurface -camera /Camera -stage testUsdImagingGLDisplacement.usda -write testUsdImagingGLDisplacement_Adaptive_VeryHigh.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLDisplacement_Adaptive_VeryHigh.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLDisplacement + ENV + HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1 +) + +pxr_register_test(testUsdImagingGLGeomSubsets_Low + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.0 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Low.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLGeomSubsets_Low.png + FAIL_PERCENT 2 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLGeomSubsets +) + + +pxr_register_test(testUsdImagingGLGeomSubsets_Medium + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Medium.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLGeomSubsets_Medium.png + FAIL_PERCENT 2 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLGeomSubsets +) + +pxr_register_test(testUsdImagingGLGeomSubsets_Points + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -shading points -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Points.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLGeomSubsets_Points.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLGeomSubsets +) + +pxr_register_test(testUsdImagingGLGeomSubsets_Quadrangulated + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Quadrangulated.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLGeomSubsets_Quadrangulated.png + FAIL_PERCENT 2 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLGeomSubsets + ENV + HD_ENABLE_FORCE_QUADRANGULATE=1 +) + + +pxr_register_test(testUsdImagingGLGeomSubsets_QuadrangulatedPoints + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -camlight -shading points -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_QuadrangulatedPoints.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLGeomSubsets_QuadrangulatedPoints.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLGeomSubsets + ENV + HD_ENABLE_FORCE_QUADRANGULATE=1 +) + +pxr_register_test(testUsdImagingGLAovVisualization_Storm_depth + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage viz_aov.usda -rendererAov depth -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLAovVisualization_Storm_depth.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLAovVisualization_Storm_depth.png + FAIL 0.05 + FAIL_PERCENT 0.001 + WARN 0.025 + WARN_PERCENT 0.002 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLAovVisualization +) + +# Register Embree Specific Tests +if (EMBREE_FOUND AND ${PXR_BUILD_EMBREE_PLUGIN}) + pxr_register_test(testUsdImagingGLHdEmbreePickAndHighlight + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLPickAndHighlight -renderer HdEmbreeRendererPlugin -offscreen -frameAll -stage test.usda -write testUsdImagingGLHdEmbreePickAndHighlight.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLHdEmbreePickAndHighlight_000.png + testUsdImagingGLHdEmbreePickAndHighlight_001.png + testUsdImagingGLHdEmbreePickAndHighlight_002.png + testUsdImagingGLHdEmbreePickAndHighlight_003.png + testUsdImagingGLHdEmbreePickAndHighlight_004.png + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLHdEmbreePickAndHighlight + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) + + pxr_register_test(testUsdImagingGLHdEmbree + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -renderer HdEmbreeRendererPlugin -stage primitives.usda -write default.png" + IMAGE_DIFF_COMPARE + default.png + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLHdEmbree + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) + + pxr_register_test(testUsdImagingGLHdEmbree_refined + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -lighting -shading smooth -frameAll -complexity 1.1 -renderer HdEmbreeRendererPlugin -stage primitives.usda -write refined.png" + IMAGE_DIFF_COMPARE + refined.png + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLHdEmbree + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) + + pxr_register_test(testUsdImagingGLFramingEmbree_1 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -renderer HdEmbreeRendererPlugin -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /main_cam -dataWindow 0 0 640 480 -displayWindow 0 0 640 480 -write testUsdImagingGLFramingEmbree1.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFramingEmbree1.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) + + + pxr_register_test(testUsdImagingGLFramingEmbree_2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -renderer HdEmbreeRendererPlugin -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /main_cam -dataWindow 0 40 640 430 -displayWindow 0 0 1280 960 -write testUsdImagingGLFramingEmbree2.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFramingEmbree2.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) + + + pxr_register_test(testUsdImagingGLFramingEmbree_3 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -renderer HdEmbreeRendererPlugin -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /main_cam -dataWindow 0 0 640 480 -displayWindow 0 0 320 480 -write testUsdImagingGLFramingEmbree3.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFramingEmbree3.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) + + + pxr_register_test(testUsdImagingGLFramingEmbree_4 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -renderer HdEmbreeRendererPlugin -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /main_cam -dataWindow 0 0 640 480 -displayWindow 0 0 320 480 -pixelAspectRatio 1.5 -write testUsdImagingGLFramingEmbree4.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFramingEmbree4.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) + + + pxr_register_test(testUsdImagingGLFramingEmbree_5 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -renderer HdEmbreeRendererPlugin -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /main_cam -dataWindow 25 136 367 298 -displayWindow 50 80 320 400 -write testUsdImagingGLFramingEmbree5.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFramingEmbree5.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) + + + pxr_register_test(testUsdImagingGLFramingEmbree_6 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -renderer HdEmbreeRendererPlugin -rendererAov color -offscreen -stage framing.usda -clear 0 0 0 1 -lighting -camera /OrthoCam -dataWindow 25 136 367 298 -displayWindow 50 80 320 400 -write testUsdImagingGLFramingEmbree6.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLFramingEmbree6.png + FAIL 0.01 + FAIL_PERCENT 0.04 + WARN 0.02 + WARN_PERCENT 0.02 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLFraming + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) + + pxr_register_test(testUsdImagingGLAovVisualization_Embree_depth + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage viz_aov.usda -renderer HdEmbreeRendererPlugin -rendererAov depth -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLAovVisualization_Embree_depth.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLAovVisualization_Embree_depth.png + FAIL 0.05 + FAIL_PERCENT 0.005 + WARN 0.025 + WARN_PERCENT 0.005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLAovVisualization + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) + + + pxr_register_test(testUsdImagingGLAovVisualization_Embree_primId + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage viz_aov.usda -renderer HdEmbreeRendererPlugin -rendererAov primId -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLAovVisualization_Embree_primId.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLAovVisualization_Embree_primId.png + FAIL 0.05 + FAIL_PERCENT 0.005 + WARN 0.025 + WARN_PERCENT 0.005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLAovVisualization + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) + + + pxr_register_test(testUsdImagingGLAovVisualization_Embree_normal + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -stage viz_aov.usda -renderer HdEmbreeRendererPlugin -rendererAov normal -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLAovVisualization_Embree_normal.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLAovVisualization_Embree_normal.png + FAIL 0.05 + FAIL_PERCENT 0.005 + WARN 0.025 + WARN_PERCENT 0.005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLAovVisualization + ENV + HDEMBREE_JITTER_CAMERA=0 + HDEMBREE_AMBIENT_OCCLUSION_SAMPLES=0 + HDEMBREE_SAMPLES_TO_CONVERGENCE=1 + ) +endif() + +# Register tests that rely on PTEX +if (PTEX_FOUND AND ${PXR_ENABLE_PTEX_SUPPORT}) + pxr_register_test(testUsdImagingGLBasicDrawing_shaders + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -offscreen -stage basicDrawing/shaders.usd -frameAll -write testUsdImagingGLBasicDrawing_shaders.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_shaders.png + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + pxr_register_test(testUsdImagingGLBasicDrawing_shadersBindings + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -offscreen -stage basicDrawing/shaders_bindings.usd -frameAll -write testUsdImagingGLBasicDrawing_shadersBindings.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_shadersBindings.png + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + pxr_register_test(testUsdImagingGLBasicDrawing_shadersRelative + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -offscreen -stage basicDrawing/shaders-relative.usd -frameAll -write testUsdImagingGLBasicDrawing_shadersRelative.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_shadersRelative.png + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + pxr_register_test(testUsdImagingGLBasicDrawing_shadersAnim + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -offscreen -times 1 2 3 -stage basicDrawing/shaders_anim.usd -frameAll -write testUsdImagingGLBasicDrawing_shadersAnim.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawing_shadersAnim_001.png + testUsdImagingGLBasicDrawing_shadersAnim_002.png + testUsdImagingGLBasicDrawing_shadersAnim_003.png + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawing + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + pxr_register_test(testUsdImagingGLGeomSubsets_Adaptive + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.1 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_Adaptive.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLGeomSubsets_Adaptive.png + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLGeomSubsets + ENV + HD_ENABLE_OPENSUBDIV3_ADAPTIVE=1 + ) + + pxr_register_test(testUsdImagingGLGeomSubsets_High + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.2 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_High.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLGeomSubsets_High.png + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLGeomSubsets + ) + + + pxr_register_test(testUsdImagingGLGeomSubsets_VeryHigh + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -complexity 1.3 -offscreen -lighting -camlight -shading wireOnSurface -frameAll -stage testUsdImagingGLGeomSubsets.usda -write testUsdImagingGLGeomSubsets_VeryHigh.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLGeomSubsets_VeryHigh.png + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLGeomSubsets + ) + + pxr_register_test(testUsdImagingGLInstancing_instance + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -stage instance.usda -write testUsdImagingGLInstancing_instance.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancing_instance.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancing + ) + + pxr_register_test(testUsdImagingGLInstancing_instance2 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -stage instance2.usda -write testUsdImagingGLInstancing_instance2.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancing_instance2.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancing + ) + + pxr_register_test(testUsdImagingGLInstancing_instance3 + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -offscreen -frameAll -lighting -stage instance3.usda -write testUsdImagingGLInstancing_instance3.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLInstancing_instance3.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLInstancing + ) + + pxr_register_test(testUsdImagingGLBasicDrawingNonBindless_shaders + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -offscreen -stage shaders.usd -frameAll -write testUsdImagingGLBasicDrawingNonBindless_shaders.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawingNonBindless_shaders.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawingNonBindless + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 + ) + + pxr_register_test(testUsdImagingGLBasicDrawingNonBindless_shadersRelative + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -lighting -offscreen -stage shaders-relative.usd -frameAll -write testUsdImagingGLBasicDrawingNonBindless_shadersRelative.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLBasicDrawingNonBindless_shadersRelative.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLBasicDrawingNonBindless + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 + ) +endif() + +# Register OpenVDB Specific Tests +if (OPENVDB_FOUND AND ${PXR_ENABLE_OPENVDB_SUPPORT}) + pxr_register_test(testUsdImagingGLVdbVolume + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolume.usda -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolume.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolume.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + + pxr_register_test(testUsdImagingGLVdbVolume_DisableSceneMaterials + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -disableSceneMaterials -rendererAov color -offscreen -stage vdbVolume.usda -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeDisableSceneMaterials.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeDisableSceneMaterials.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + + pxr_register_test(testUsdImagingGLVdbVolume_Large + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeLarge.usda -clear 0 0 0 1 -lighting -camera /World/main_cam -write testUsdImagingGLVdbVolumeLarge.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeLarge.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + + pxr_register_test(testUsdImagingGLVdbVolume_Flipped + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeFlipped.usda -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeFlipped.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeFlipped.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + + pxr_register_test(testUsdImagingGLVdbVolume_FallbackMaterial + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeFallbackMaterial.usda -times 1 2 3 -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeFallbackMaterial.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeFallbackMaterial_001.png + testUsdImagingGLVdbVolumeFallbackMaterial_002.png + testUsdImagingGLVdbVolumeFallbackMaterial_003.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + + pxr_register_test(testUsdImagingGLVdbVolume_Inside + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeInside.usda -times 1 13 -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeInside.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeInside_001.png + testUsdImagingGLVdbVolumeInside_013.png + FAIL 0.005 + FAIL_PERCENT 0.001 + WARN 0.005 + WARN_PERCENT 0.0005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + + pxr_register_test(testUsdImagingGLVdbVolume_Ortho + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeOrtho.usda -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeOrtho.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeOrtho.png + FAIL_PERCENT 2 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + + pxr_register_test(testUsdImagingGLVdbVolume_TwoFields + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeTwoFields.usda -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeTwoFields.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeTwoFields.png + FAIL_PERCENT 2 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + + pxr_register_test(testUsdImagingGLVdbVolume_TargetMemory + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeTargetMemory.usda -times 2 -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeTargetMemory.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeTargetMemory.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=1 + ) + + pxr_register_test(testUsdImagingGLVdbVolumeNonBindless + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolume.usda -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolume.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolume.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 + ) + + + pxr_register_test(testUsdImagingGLVdbVolumeNonBindless_DisableSceneMaterials + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -disableSceneMaterials -rendererAov color -offscreen -stage vdbVolume.usda -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeDisableSceneMaterials.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeDisableSceneMaterials.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 + ) + + + pxr_register_test(testUsdImagingGLVdbVolumeNonBindless_Large + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeLarge.usda -clear 0 0 0 1 -lighting -camera /World/main_cam -write testUsdImagingGLVdbVolumeLarge.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeLarge.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 + ) + + + pxr_register_test(testUsdImagingGLVdbVolumeNonBindless_Flipped + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeFlipped.usda -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeFlipped.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeFlipped.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 + ) + + + pxr_register_test(testUsdImagingGLVdbVolumeNonBindless_FallbackMaterial + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeFallbackMaterial.usda -times 1 2 3 -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeFallbackMaterial.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeFallbackMaterial_001.png + testUsdImagingGLVdbVolumeFallbackMaterial_002.png + testUsdImagingGLVdbVolumeFallbackMaterial_003.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 + ) + + + pxr_register_test(testUsdImagingGLVdbVolumeNonBindless_Inside + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeInside.usda -times 1 13 -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeInside.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeInside_001.png + testUsdImagingGLVdbVolumeInside_013.png + FAIL 0.005 + FAIL_PERCENT 0.001 + WARN 0.005 + WARN_PERCENT 0.0005 + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 + ) + + + pxr_register_test(testUsdImagingGLVdbVolumeNonBindless_Ortho + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeOrtho.usda -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeOrtho.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeOrtho.png + FAIL_PERCENT 2 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 + ) + + + pxr_register_test(testUsdImagingGLVdbVolumeNonBindless_TwoFields + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeTwoFields.usda -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeTwoFields.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeTwoFields.png + FAIL_PERCENT 2 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 + ) + + + pxr_register_test(testUsdImagingGLVdbVolumeNonBindless_TargetMemory + COMMAND "${CMAKE_INSTALL_PREFIX}/tests/testUsdImagingGLBasicDrawing -rendererAov color -offscreen -stage vdbVolumeTargetMemory.usda -times 2 -clear 0 0 0 1 -lighting -camera /main_cam -write testUsdImagingGLVdbVolumeTargetMemory.png" + IMAGE_DIFF_COMPARE + testUsdImagingGLVdbVolumeTargetMemory.png + FAIL 1 + FAIL_PERCENT 1 + PERCEPTUAL + EXPECTED_RETURN_CODE 0 + TESTENV testUsdImagingGLVdbVolume + ENV + HGIGL_ENABLE_BINDLESS_TEXTURE=0 + ) +endif() \ No newline at end of file diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLAnimatedLights/lightMoving.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLAnimatedLights/lightMoving.usda index fd37789caa..b91160e0b8 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLAnimatedLights/lightMoving.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLAnimatedLights/lightMoving.usda @@ -2,6 +2,7 @@ ( startTimeCode = 1 endTimeCode = 3 + upAxis = "Z" ) def Sphere "sphere" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/basicDrawing.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/basicDrawing.usda index 5cc668c8ae..c33924643c 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/basicDrawing.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/basicDrawing.usda @@ -2,6 +2,7 @@ ( endFrame = 40 startFrame = 1 + upAxis = "Z" ) def Xform "Meshes" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/leftHanded.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/leftHanded.usda index 75f613d90a..45e90c07ff 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/leftHanded.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/leftHanded.usda @@ -3,6 +3,7 @@ defaultPrim = "SimpleSphere" endFrame = 1 startFrame = 1 + upAxis = "Z" ) def Mesh "SimpleSphere" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders-relative.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders-relative.usd index a14a9680f3..5b22aa1b18 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders-relative.usd +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders-relative.usd @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Scope "Materials" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders.usd index 4c26a21ba4..5d23baed06 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders.usd +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders.usd @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Scope "Materials" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_anim.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_anim.usd index 976245f657..f9f7046310 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_anim.usd +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_anim.usd @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Scope "Materials" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_bindings.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_bindings.usd index a7754375fa..440efd6302 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_bindings.usd +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/shaders_bindings.usd @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Scope "Materials" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/textureChannels.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/textureChannels.usd index 8cbd8ad8bf..61afaa4691 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/textureChannels.usd +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/basicDrawing/textureChannels.usd @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) class Mesh "MeshProto" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/subdivTags.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/subdivTags.usda index bfaff6abd3..d12bb10f9f 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/subdivTags.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawing/subdivTags.usda @@ -1,4 +1,8 @@ #usda 1.0 +( + upAxis = "Z" +) + def Xform "Geom" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders-relative.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders-relative.usd index 17cd9e88ad..b5722bd1ce 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders-relative.usd +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders-relative.usd @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Scope "Materials" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usd index 6f9c403cb7..dc916ef354 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usd +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usd @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Scope "Materials" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usda index 3da996d1d0..0b07c21c69 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicDrawingNonBindless/shaders.usda @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Scope "Looks" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicLighting/basicDrawing.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicLighting/basicDrawing.usda index 5cc668c8ae..c33924643c 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicLighting/basicDrawing.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLBasicLighting/basicDrawing.usda @@ -2,6 +2,7 @@ ( endFrame = 40 startFrame = 1 + upAxis = "Z" ) def Xform "Meshes" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCards/testAnim.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCards/testAnim.usda index 007de742a5..fbad0d8863 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCards/testAnim.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCards/testAnim.usda @@ -2,6 +2,7 @@ ( endFrame = 2 startFrame = 1 + upAxis = "Z" ) def Xform "World" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLColorOpacityPrimvar/color_opacity_primvar.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLColorOpacityPrimvar/color_opacity_primvar.usda index 0a898f2f28..aa4ed2241e 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLColorOpacityPrimvar/color_opacity_primvar.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLColorOpacityPrimvar/color_opacity_primvar.usda @@ -2,6 +2,7 @@ ( endTimeCode = 1 startTimeCode = 0 + upAxis = "Z" ) # Test the robust handling of color and opacity primvars in # UsdImagingGprimAdapter. diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLComplexityOsd3/subdivMesh.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLComplexityOsd3/subdivMesh.usda index eac2414f45..5919c1be63 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLComplexityOsd3/subdivMesh.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLComplexityOsd3/subdivMesh.usda @@ -3,6 +3,7 @@ doc = "Test Subdiv Tags" endFrame = 1 startFrame = 1 + upAxis = "Z" ) def Mesh "pPlane1" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCurves/basicCurves.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCurves/basicCurves.usda index 4d49de15fe..ca30c87880 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCurves/basicCurves.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLCurves/basicCurves.usda @@ -2,6 +2,7 @@ ( endFrame = 40 startFrame = 1 + upAxis = "Z" ) def Scope "World" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLDoubleSided/doubleSided2.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLDoubleSided/doubleSided2.usda index 6330d2517d..b887760423 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLDoubleSided/doubleSided2.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLDoubleSided/doubleSided2.usda @@ -3,6 +3,7 @@ doc = "Test DoubleSided Imaging" endFrame = 40 startFrame = 1 + upAxis = "Z" ) def Xform "Meshes" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVarying.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVarying.usda index fcfebeedef..8ef2a85430 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVarying.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVarying.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) class Mesh "QuadMeshProto" { point3f[] points = [ diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLeftHanded.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLeftHanded.usda index 868b93132a..859821c25d 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLeftHanded.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLeftHanded.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) class Mesh "QuadMeshProto" { int[] faceVertexCounts = [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4] diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLinearInterp.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLinearInterp.usda index 34e22776fe..afb52b5afa 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLinearInterp.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFaceVarying/testUsdImagingGLFaceVaryingLinearInterp.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) class Mesh "QuadMeshProto" { int[] faceVertexCounts = [4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4] diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFallbackPrimTypes/fallbacks3.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFallbackPrimTypes/fallbacks3.usda index e305fdd268..86f2f8ed0d 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFallbackPrimTypes/fallbacks3.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFallbackPrimTypes/fallbacks3.usda @@ -1,5 +1,6 @@ #usda 1.0 ( + upAxis = "Z" subLayers = [@primitives.usda@] fallbackPrimTypes = { token[] UnknownCone = ["UnknownCylinder", "Cylinder"] diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShading/primitives.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShading/primitives.usda index 71b0ec2196..85892361be 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShading/primitives.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShading/primitives.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Capsule "MyCapsule" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShadingRef/primitives.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShadingRef/primitives.usda index 71b0ec2196..85892361be 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShadingRef/primitives.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLFlatShadingRef/primitives.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Capsule "MyCapsule" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/instance.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/instance.usda index 075dca581b..74639fd932 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/instance.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/instance.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "DormRoomDouble" ( kind = "prop" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi.usda index b012d138bc..e79294107c 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "World" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi_ni.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi_ni.usda index ad63d516a5..9f1ad5a9ee 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi_ni.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHighlight/pi_ni.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "ProtoRed" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHoleFaces/holeFaces.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHoleFaces/holeFaces.usda index cb6811c7ca..30fb869d9f 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHoleFaces/holeFaces.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLHoleFaces/holeFaces.usda @@ -3,6 +3,7 @@ doc = "Test Hole Imaging" endFrame = 40 startFrame = 1 + upAxis = "Z" ) def Mesh "pPlane1" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLImplicits/implicits.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLImplicits/implicits.usda index 4bca053900..1cc9c1ed06 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLImplicits/implicits.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLImplicits/implicits.usda @@ -3,6 +3,7 @@ doc = "Implicit Geometry" endFrame = 20 startFrame = 1 + upAxis = "Z" ) def Xform "Fallback" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes.usd index 6018360cb4..502c0e457e 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes.usd +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes.usd @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) class "_Depth_2" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Instanced.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Instanced.usd index 490e47ff7b..bd273d801b 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Instanced.usd +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Instanced.usd @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) class "_Depth_2" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Nested_Instances.usd b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Nested_Instances.usd index a8aad807a4..55089e5120 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Nested_Instances.usd +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInheritedPurpose/InheritedPurposes_Nested_Instances.usd @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) class "_Depth_2" { custom token purpose = "proxy" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/baseline/testUsdImagingGLInstancePrimvarsAnimated_001.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/baseline/testUsdImagingGLInstancePrimvarsAnimated_001.png new file mode 100644 index 0000000000..e2e8e7fa8f Binary files /dev/null and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/baseline/testUsdImagingGLInstancePrimvarsAnimated_001.png differ diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/baseline/testUsdImagingGLInstancePrimvarsAnimated_002.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/baseline/testUsdImagingGLInstancePrimvarsAnimated_002.png new file mode 100644 index 0000000000..94e248f222 Binary files /dev/null and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/baseline/testUsdImagingGLInstancePrimvarsAnimated_002.png differ diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/baseline/testUsdImagingGLInstancePrimvarsAnimated_003.png b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/baseline/testUsdImagingGLInstancePrimvarsAnimated_003.png new file mode 100644 index 0000000000..92591f87fd Binary files /dev/null and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/baseline/testUsdImagingGLInstancePrimvarsAnimated_003.png differ diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/testAnimated.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/testAnimated.usda new file mode 100644 index 0000000000..3d4f30871e --- /dev/null +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancePrimvars/testAnimated.usda @@ -0,0 +1,140 @@ +#usda 1.0 +( + """Test USD file demonstrating point-instancer constant primvars.""" + endTimeCode = 3 + startTimeCode = 1 + upAxis = "Y" +) + +class Xform "Teapot_NonInstanceable" +{ + def Sphere "Geom" + { + double3 xformOp:scale = (0.3, 0.3, 0.3) + token[] xformOpOrder = ["xformOp:scale"] + } +} + +class Xform "Teapot_Instanceable" ( + inherits = + instanceable = 1 +) +{ +} + +class Xform "TeapotPair_NativeInstances" +{ + def "Teapot1" (inherits = ) { + double3 xformOp:translate = (0, 0, 0) + token[] xformOpOrder = ["xformOp:translate"] + } + def "Teapot2" (inherits = ) { + double3 xformOp:translate = (1, 0, 0) + token[] xformOpOrder = ["xformOp:translate"] + } +} + +class Xform "TeapotPair_PointInstances" +{ + def PointInstancer "Instancer" { + point3f[] positions = [(0,0,0), (1,0,0)] + int[] protoIndices = [0,0] + rel prototypes = [] + color3f[] primvars:displayColor = [] (interpolation = "varying") + color3f[] primvars:displayColor.timeSamples = { + 1: [(0.9, 0.1, 0.1), (0.1, 0.9, 0.1)], + 2: [(0.1, 0.1, 0.9), (0.9, 0.1, 0.1)], + 3: [(0.1, 0.6, 0.1), (0.8, 0.6, 0.1)], + } + } + def Scope "Prototypes" + { + token visibility = "invisible" + def Xform "Teapot" (inherits = ) + { + } + } +} + +def Xform "World" +{ + double3 xformOp:scale = (4, 4, 4) + double3 xformOp:translate = (-0.5, -0.6, 0) + token[] xformOpOrder = ["xformOp:scale", "xformOp:translate"] + + def Xform "TeapotPair1_NonInstanced" + { + def "Teapot1" (inherits = ) { + double3 xformOp:translate = (0, 0, 0) + token[] xformOpOrder = ["xformOp:translate"] + color3f primvars:displayColor = (0.1, 0.1, 0.1) + } + def "Teapot2" (inherits = ) { + double3 xformOp:translate = (1, 0, 0) + token[] xformOpOrder = ["xformOp:translate"] + color3f primvars:displayColor = (0.8, 0.1, 0.1) + } + } + + def Xform "TeapotPair2_NativeInstances_Scalar" ( + inherits = + ) + { + double3 xformOp:translate = (0, 0.6, 0) + token[] xformOpOrder = ["xformOp:translate"] + over "Teapot1" { + color3f primvars:displayColor = (0.1, 0.1, 0.1) + color3f primvars:displayColor.timeSamples = { + 1: (0.1, 0.3, 0.1), + 2: (0.8, 0.3, 0.1), + 3: (0.1, 0.3, 0.8), + } + } + over "Teapot2" { + color3f primvars:displayColor = (0.8, 0.8, 0.8) + color3f primvars:displayColor.timeSamples = { + 1: (0.8, 0.3, 0.1), + 2: (0.1, 0.3, 0.1), + 3: (0.8, 0.3, 0.8), + } + } + } + + def Xform "TeapotPair3_NativeInstances_Array" ( + inherits = + ) + { + double3 xformOp:translate = (0, 1.2, 0) + token[] xformOpOrder = ["xformOp:translate"] + over "Teapot1" { + color3f[] primvars:displayColor = [(0.1, 0.1, 0.1)] + color3f[] primvars:displayColor.timeSamples = { + 1: [(0.1, 0.3, 0.1)], + 2: [(0.8, 0.3, 0.1)], + 3: [(0.1, 0.3, 0.8)], + } + } + over "Teapot2" { + color3f[] primvars:displayColor = [(0.8, 0.8, 0.8)] + color3f[] primvars:displayColor.timeSamples = { + 1: [(0.8, 0.3, 0.1)], + 2: [(0.1, 0.3, 0.1)], + 3: [(0.8, 0.3, 0.8)], + } + } + } + + def Xform "TeapotPair4_PointInstances" + { + double3 xformOp:translate = (0, 1.8, 0) + token[] xformOpOrder = ["xformOp:translate"] + + def "Geom" ( inherits = ) + { + color3f[] primvars:displayColor = [ + (0.1, 0.6, 0.1), + (0.8, 0.6, 0.1) + ] (interpolation = "varying") + } + } +} diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance.usda index a52bb3abfc..73df86592f 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance.usda @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Xform "Parent" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance2.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance2.usda index 0b3c43dc6b..c73c62c6a6 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance2.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance2.usda @@ -11,6 +11,7 @@ """ endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Xform "Mesh" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance3.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance3.usda index a28a0774cb..e5d81de2fa 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance3.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instance3.usda @@ -11,6 +11,7 @@ """ endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Xform "Mesh" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes.usda index 2ca9f0bf76..9c4c89a36a 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes.usda @@ -2,6 +2,7 @@ ( endFrame = 1 startFrame = 1 + upAxis = "Z" ) def Xform "Cube" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2.usda index 93ffd15f48..6d6de3a8db 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2.usda @@ -2,6 +2,7 @@ ( endFrame = 1 startFrame = 1 + upAxis = "Z" ) def Xform "Cube" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2NoInstancing.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2NoInstancing.usda index ff9b55d7b6..809f281777 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2NoInstancing.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/instancedCubes2NoInstancing.usda @@ -2,6 +2,7 @@ ( endFrame = 1 startFrame = 1 + upAxis = "Z" ) def Cube "Cube" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/nestedInstancedCubes.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/nestedInstancedCubes.usda index a86e8a99be..628713e3cd 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/nestedInstancedCubes.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLInstancing/nestedInstancedCubes.usda @@ -2,6 +2,7 @@ ( endFrame = 1 startFrame = 1 + upAxis = "Z" ) def Xform "Cubes_1" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/StinsonBeach.hdr b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/StinsonBeach.hdr new file mode 100644 index 0000000000..a7d1590dbd Binary files /dev/null and b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/StinsonBeach.hdr differ diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/basicMxYup.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/basicMxYup.usda index c60e3e7c2c..14d19c811a 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/basicMxYup.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/basicMxYup.usda @@ -22,7 +22,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "./Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ } } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/basicMxZup.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/basicMxZup.usda index c062150713..462e1d1eac 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/basicMxZup.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/basicMxZup.usda @@ -22,7 +22,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "./Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ float xformOp:rotateX:Zup = 90 uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"] } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxDirectLights.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxDirectLights.usda index 358eda0bf6..37ec29b0a2 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxDirectLights.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxDirectLights.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) def Sphere "mxSphere" { rel material:binding = color3f[] primvars:displayColor = [(0.1, 0.5, 0.8)] diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGeomprop.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGeomprop.usda index 0905256edc..7b622903a3 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGeomprop.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGeomprop.usda @@ -1,5 +1,8 @@ #usda 1.0 - +( + upAxis = "Z" +) + def Scope "MaterialX" ( references = [ @./geomprop.mtlx@, @@ -18,7 +21,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "./Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ float xformOp:rotateX:Zup = 90 uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"] } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGlass.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGlass.usda index 690dd871ec..f11df07323 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGlass.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxGlass.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Sphere "Default" { rel material:binding = @@ -56,7 +59,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ float xformOp:rotateX:Zup = 90 uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"] } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Default.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Default.usda index 0c23fe0ff1..adbadb0458 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Default.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Default.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) def Scope "MaterialX_Default" { def Sphere "MxUsdDefault" { rel material:binding = @@ -87,7 +89,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "./Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ float xformOp:rotateX:Zup = 90 uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"] } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Gold.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Gold.usda index c370ff316e..338d26e388 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Gold.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxPreviewSurfaceVsNative_Gold.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) def Scope "MaterialX_Gold" { def Sphere "MxUsdGold" { rel material:binding = @@ -86,7 +88,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "./Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ float xformOp:rotateX:Zup = 90 uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"] } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxSimple.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxSimple.usda index 92c3ef5545..8e6eb14363 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxSimple.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxSimple.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) def Sphere "ball1" { rel material:binding = color3f[] primvars:displayColor = [(0.1, 0.5, 0.8)] @@ -28,7 +30,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "./Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ float xformOp:rotateX:Zup = 90 uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"] } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxTextured.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxTextured.usda index b045de4f38..df39da0868 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxTextured.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxTextured.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) def Mesh "UsdBrassSphere" { @@ -65,7 +67,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "./Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ float xformOp:rotateX:Zup = 90 uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"] } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxTextured2.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxTextured2.usda index 9e0dd92703..dc9428f498 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxTextured2.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/mxTextured2.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) def Mesh "TestSphere" { @@ -26,7 +28,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "./Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ float xformOp:rotateX:Zup = 90 uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"] } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/standardSurface.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/standardSurface.usda index dce5f1988c..f520dd43de 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/standardSurface.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/standardSurface.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) def Sphere "ball1" { rel material:binding = color3f[] primvars:displayColor = [(0.1, 0.5, 0.8)] @@ -54,7 +56,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "./Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ float xformOp:rotateX:Zup = 90 uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"] } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/standardSurfaceMarble.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/standardSurfaceMarble.usda index e3530eb383..4b47beb094 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/standardSurfaceMarble.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/standardSurfaceMarble.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) def Sphere "ball1" { rel material:binding = color3f[] primvars:displayColor = [(0.1, 0.5, 0.8)] @@ -33,7 +35,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "./Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ float xformOp:rotateX:Zup = 90 uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"] } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/usdPreviewSurface.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/usdPreviewSurface.usda index 187f9fbb2b..95a54e0cb7 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/usdPreviewSurface.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMaterialX/usdPreviewSurface.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) def Sphere "ball1" { rel material:binding = color3f[] primvars:displayColor = [(0.1, 0.5, 0.8)] @@ -40,7 +42,7 @@ def Xform "lights" { def DomeLight "DomeLight" { - asset inputs:texture:file = "./Env_StinsonBeach.tex" + asset inputs:texture:file = @./StinsonBeach.hdr@ float xformOp:rotateX:Zup = 90 uniform token[] xformOpOrder = ["xformOp:rotateX:Zup"] } diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMeshQuadrangulation/meshQuadrangulation.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMeshQuadrangulation/meshQuadrangulation.usda index c2dd709cbf..db26a3c7fc 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMeshQuadrangulation/meshQuadrangulation.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMeshQuadrangulation/meshQuadrangulation.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) class "TestMesh" { # 0--------4---18--7---24----9 diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMipmap/testUsdImagingGLMipmap.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMipmap/testUsdImagingGLMipmap.usda index 2d3d61c47b..64c99134ef 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMipmap/testUsdImagingGLMipmap.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLMipmap/testUsdImagingGLMipmap.usda @@ -2,6 +2,7 @@ ( startTimeCode = 1 endTimeCode = 19 + upAxis = "Z" ) def Material "Material" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLNormals/testNormals.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLNormals/testNormals.usda index 09f4a35fbb..108590386d 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLNormals/testNormals.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLNormals/testNormals.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "R" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight/instance.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight/instance.usda index 50d997aa84..1b83fefc7e 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight/instance.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPickAndHighlight/instance.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Mesh "Plane1" ( active = false diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/ni_pi.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/ni_pi.usda index 94e90cca89..596875e6e1 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/ni_pi.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/ni_pi.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "World" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi.usda index 570f9fa680..caa52f7e29 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "ProtoRed" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_basic.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_basic.usda index faacf2a0e3..c8ab81baf0 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_basic.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_basic.usda @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Xform "Root" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_masking.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_masking.usda index a0202ccba8..81d6f89b64 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_masking.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_masking.usda @@ -2,6 +2,7 @@ ( endTimeCode = 4 startTimeCode = 0 + upAxis = "Z" ) def PointInstancer "Instancer" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni.usda index ad63d516a5..9f1ad5a9ee 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "ProtoRed" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni2.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni2.usda index f36c67fb4c..de49ee192e 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni2.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni2.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "ProtoRed" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_material.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_material.usda index af09f9c839..6224d98af5 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_material.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_material.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "ProtoRed" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_material2.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_material2.usda index 43819de100..0d9d0b203d 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_material2.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_material2.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "ProtoSphere" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_pi.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_pi.usda index 199031acfc..da395cdfd6 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_pi.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_ni_pi.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def PointInstancer "ParentInstancer1" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi.usda index 435d7de400..81ed0e3528 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Cube" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi2.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi2.usda index 2c3ed56489..193fef74ca 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi2.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi2.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Cube" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi_time.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi_time.usda index c5e2ce31af..f260228587 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi_time.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi_time.usda @@ -2,6 +2,7 @@ ( endFrame = 2 startFrame = 0 + upAxis = "Z" ) def Xform "Root" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi_varying.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi_varying.usda index 0169621dc5..98174c6a58 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi_varying.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_pi_varying.usda @@ -2,6 +2,7 @@ ( endFrame = 24 startFrame = 0 + upAxis = "Z" ) def PointInstancer "TopInstancer" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_root_prototype.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_root_prototype.usda index 2dcb4f68c7..0182f77954 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_root_prototype.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_root_prototype.usda @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Xform "Root" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_sibling_pi.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_sibling_pi.usda index 1478b5b5b5..347a2e9de3 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_sibling_pi.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_sibling_pi.usda @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Xform "Root" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_sibling_prototype.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_sibling_prototype.usda index fc94eb2007..3fb1ef3dab 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_sibling_prototype.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_sibling_prototype.usda @@ -2,6 +2,7 @@ ( endFrame = 10 startFrame = 1 + upAxis = "Z" ) def Xform "Root" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_varying.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_varying.usda index 531e5bb0e8..62d7c6a2e8 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_varying.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPointInstancer/pi_varying.usda @@ -2,6 +2,7 @@ ( endFrame = 30 startFrame = 0 + upAxis = "Z" ) # ---------------------------------------------------------------------------- # diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPoints/basicPoints.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPoints/basicPoints.usda index c9370bdbd8..ca2210f398 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPoints/basicPoints.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPoints/basicPoints.usda @@ -2,6 +2,7 @@ ( endFrame = 2 startFrame = 1 + upAxis = "Z" ) def Points "geo1" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceAnimated.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceAnimated.usda index f73b0c822f..6d5e4ed3eb 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceAnimated.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceAnimated.usda @@ -3,6 +3,7 @@ defaultPrim = "Scene" endTimeCode = 4 startTimeCode = 1 + upAxis = "Z" ) def Xform "Scene" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceMaterialInterface.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceMaterialInterface.usda index bc1a66089e..52f10cd6b3 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceMaterialInterface.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceMaterialInterface.usda @@ -3,6 +3,7 @@ defaultPrim = "Scene" endTimeCode = 1 startTimeCode = 1 + upAxis = "Z" ) def Xform "Scene" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceSourceColorSpace.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceSourceColorSpace.usda index f971b1767a..bdc754fbf0 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceSourceColorSpace.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceSourceColorSpace.usda @@ -3,6 +3,7 @@ defaultPrim = "Scene" endTimeCode = 1 startTimeCode = 1 + upAxis = "Z" ) class Mesh "Plane" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTexture.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTexture.usda index b54834d498..745abd25a9 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTexture.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTexture.usda @@ -3,6 +3,7 @@ defaultPrim = "Scene" endTimeCode = 1 startTimeCode = 1 + upAxis = "Z" ) def Xform "Scene" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTextureOpacity.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTextureOpacity.usda index 5db25d5a4d..548b3cea73 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTextureOpacity.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTextureOpacity.usda @@ -3,6 +3,7 @@ defaultPrim = "Scene" endTimeCode = 1 startTimeCode = 1 + upAxis = "Z" ) def Xform "Scene" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTextureScaleAndBias.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTextureScaleAndBias.usda index bee081e5a8..65c45f0239 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTextureScaleAndBias.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTextureScaleAndBias.usda @@ -3,6 +3,7 @@ defaultPrim = "Scene" endTimeCode = 1 startTimeCode = 1 + upAxis = "Z" ) class Mesh "Plane" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTransform2d.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTransform2d.usda index b001a27135..bb1ec2575d 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTransform2d.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPreviewSurface/testPreviewSurfaceTransform2d.usda @@ -3,6 +3,7 @@ defaultPrim = "Scene" endTimeCode = 1 startTimeCode = 1 + upAxis = "Z" ) class Mesh "Plane" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimitiveDrawingRef/primitives.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimitiveDrawingRef/primitives.usda index 71b0ec2196..85892361be 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimitiveDrawingRef/primitives.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimitiveDrawingRef/primitives.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Capsule "MyCapsule" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarRefinement/testUsdImagingGLPrimvarRefinement.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarRefinement/testUsdImagingGLPrimvarRefinement.usda index f83a8d8ec0..c6b768f909 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarRefinement/testUsdImagingGLPrimvarRefinement.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarRefinement/testUsdImagingGLPrimvarRefinement.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) class Mesh "QuadMeshProto" { point3f[] points = [ diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarSharing/primvar_sharing.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarSharing/primvar_sharing.usda index acd8dbdf58..0f777afbe0 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarSharing/primvar_sharing.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarSharing/primvar_sharing.usda @@ -2,6 +2,7 @@ ( startTimeCode = 0 endTimeCode = 2 + upAxis = "Z" ) def Xform "Geom" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarSharing/primvar_sharing_colors.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarSharing/primvar_sharing_colors.usda index c74fc9d377..ad2e4a426f 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarSharing/primvar_sharing_colors.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLPrimvarSharing/primvar_sharing_colors.usda @@ -2,6 +2,7 @@ ( endTimeCode = 2 startTimeCode = 0 + upAxis = "Z" ) def Xform "Geom" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync/instancer.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync/instancer.usda index 338cdf12b1..93f8292ab4 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync/instancer.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync/instancer.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Root" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync/world.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync/world.usda index 1d42d8c8b6..d2509d4237 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync/world.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLResync/world.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Scope "World" { def "Model" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/object.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/object.usda index 4b41925bd4..19c24c45f7 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/object.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/object.usda @@ -1,5 +1,7 @@ #usda 1.0 - +( + upAxis = "Z" +) def Xform "Geom" { def Mesh "Plane" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/usdGlslfxEmbedded.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/usdGlslfxEmbedded.usda index 0e43797213..9f8f939125 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/usdGlslfxEmbedded.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSdr/usdGlslfxEmbedded.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "Geom" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBadTexture/shader_change.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBadTexture/shader_change.usda index e1e5539c97..e3b2ec75a7 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBadTexture/shader_change.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeBadTexture/shader_change.usda @@ -2,6 +2,7 @@ ( endFrame = 2 startFrame = 1 + upAxis = "Z" ) def Mesh "Mesh" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeMaterial/coloredCubes.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeMaterial/coloredCubes.usda index 7ca73a368d..b27329ac97 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeMaterial/coloredCubes.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeMaterial/coloredCubes.usda @@ -2,6 +2,7 @@ ( endFrame = 1 startFrame = 1 + upAxis = "Z" ) def Xform "Cubes" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeMaterialRef/coloredCubes.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeMaterialRef/coloredCubes.usda index 9704d7731e..b969a20e1f 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeMaterialRef/coloredCubes.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLShadeMaterialRef/coloredCubes.usda @@ -2,6 +2,7 @@ ( endFrame = 1 startFrame = 1 + upAxis = "Z" ) def Xform "Cubes" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSkeleton/skeleton.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSkeleton/skeleton.usda index 047271e37c..d1239dd48a 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSkeleton/skeleton.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSkeleton/skeleton.usda @@ -2,6 +2,7 @@ ( endTimeCode = 3 startTimeCode = 1 + upAxis = "Z" ) def SkelRoot "SkelChar" diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionOsd3/lefthandedMesh.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionOsd3/lefthandedMesh.usda index 25890236bf..d05d95a5eb 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionOsd3/lefthandedMesh.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionOsd3/lefthandedMesh.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "xform" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionOsd3/subdivMesh.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionOsd3/subdivMesh.usda index eac2414f45..5919c1be63 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionOsd3/subdivMesh.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionOsd3/subdivMesh.usda @@ -3,6 +3,7 @@ doc = "Test Subdiv Tags" endFrame = 1 startFrame = 1 + upAxis = "Z" ) def Mesh "pPlane1" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionSchemeNone/ring.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionSchemeNone/ring.usda index 1b3f239ddd..91d71389a5 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionSchemeNone/ring.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSubdivisionSchemeNone/ring.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Mesh "mesh" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader/shader_change.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader/shader_change.usda index 8b9f3c270d..2b0f02c9a4 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader/shader_change.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLSurfaceShader/shader_change.usda @@ -2,6 +2,7 @@ ( endFrame = 2 startFrame = 1 + upAxis = "Z" ) def Mesh "Mesh" ( diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTriangleSubdivisionRuleOsd3/catmark_and_smooth_tris.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTriangleSubdivisionRuleOsd3/catmark_and_smooth_tris.usda index f58fbe973f..eb538a26d9 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTriangleSubdivisionRuleOsd3/catmark_and_smooth_tris.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLTriangleSubdivisionRuleOsd3/catmark_and_smooth_tris.usda @@ -1,8 +1,11 @@ #usda 1.0 -# This test draws two identical cylindrical triangle meshes with catmullClark -# subdivision. The first uses catmullClark for the triangle weights, while -# the second uses smooth weights during subdivision. -# The second cylinder should appear smoother. +( + # This test draws two identical cylindrical triangle meshes with catmullClark + # subdivision. The first uses catmullClark for the triangle weights, while + # the second uses smooth weights during subdivision. + # The second cylinder should appear smoother. + upAxis = "Z" +) def Mesh "catmark_smoothtris0" { int[] faceVertexCounts = [3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3] diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdLux/usdLux.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdLux/usdLux.usda index b3ffeecaa7..fc37c024b1 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdLux/usdLux.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdLux/usdLux.usda @@ -1,4 +1,7 @@ #usda 1.0 +( + upAxis = "Z" +) def Xform "transform" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdSkel/arm.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdSkel/arm.usda index 56f8bba819..7e49b9b9c7 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdSkel/arm.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdSkel/arm.usda @@ -2,6 +2,7 @@ ( startTimeCode = 1 endTimeCode = 10 + upAxis = "Z" ) def SkelRoot "Model" { def Skeleton "Skel" { diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdSkel/arm_baked.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdSkel/arm_baked.usda index d0d0d67d7e..9f54da2b8b 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdSkel/arm_baked.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLUsdSkel/arm_baked.usda @@ -3,6 +3,7 @@ "Created by UsdView" endTimeCode = 10 startTimeCode = 1 + upAxis = "Z" subLayers = [ @arm.usda@ ] diff --git a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVaryingTopology/varying.usda b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVaryingTopology/varying.usda index effc8b5fca..6cf11eccb2 100644 --- a/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVaryingTopology/varying.usda +++ b/pxr/usdImaging/usdImagingGL/testenv/testUsdImagingGLVaryingTopology/varying.usda @@ -2,6 +2,7 @@ ( endFrame = 3 startFrame = 1 + upAxis = "Z" ) def Xform "Root" (