Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Adjust image diff threshold for testMayaLights #55

Merged
merged 5 commits into from
Feb 2, 2024
Merged

Adjust image diff threshold for testMayaLights #55

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36b4e79
Adjust image diff threshold for testMayaLights
debloip-adsk Feb 2, 2024
74677e7
Per-platform image diff thresholds
debloip-adsk Feb 2, 2024
f863683
Add comment
debloip-adsk Feb 2, 2024
544fa2e
Add missing self parameter
debloip-adsk Feb 2, 2024
254739c
Set percent threshold to 3 on OSX
debloip-adsk Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions test/lib/mayaUsd/render/mayaToHydra/testMayaLights.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,23 @@
import mayaUtils
import unittest

import platform

class TestMayaLights(mtohUtils.MtohTestCase): #Subclassing mtohUtils.MtohTestCase to be able to call self.assertSnapshotClose
# MayaHydraBaseTestCase.setUpClass requirement.
_file = __file__

IMAGE_DIFF_FAIL_THRESHOLD = 0.01
IMAGE_DIFF_FAIL_PERCENT = 0.2
@property
def imageDiffFailThreshold(self):
return 0.01

@property
def imageDiffFailPercent(self):
# Wireframes seem to have a slightly different color on macOS. We'll increase the thresholds
# for that platform specifically for now, so we can still catch issues on other platforms.
if platform.system() == "Darwin":
return 3
return 0.2

def verifyLightingModes(self, shadowOn):
imageSuffix = "_shadowOn" if shadowOn else ""
Expand All @@ -37,44 +48,44 @@ def verifyLightingModes(self, shadowOn):
#All Lights mode
cmds.modelEditor(panel, edit=True, displayLights="all")
cmds.refresh()
self.assertSnapshotClose("allLights" + imageSuffix + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
self.assertSnapshotClose("allLights" + imageSuffix + ".png", self.imageDiffFailThreshold, self.imageDiffFailPercent)

#Default Light mode
cmds.modelEditor(panel, edit=True, displayLights="default")
cmds.refresh()
self.assertSnapshotClose("defaultLight" + imageSuffix + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
self.assertSnapshotClose("defaultLight" + imageSuffix + ".png", self.imageDiffFailThreshold, self.imageDiffFailPercent)

#Selected Light mode
cmds.modelEditor(panel, edit=True, displayLights="selected")
cmds.select( clear=True )
#Use Directional Light
cmds.select( 'directionalLight1', r=True )
cmds.refresh()
self.assertSnapshotClose("directionalLight" + imageSuffix + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
self.assertSnapshotClose("directionalLight" + imageSuffix + ".png", self.imageDiffFailThreshold, self.imageDiffFailPercent)

#Use Point Light
#TODO: Enable shadowOn test on point light when it works
if not shadowOn:
cmds.select( 'pointLight1', r=True )
cmds.refresh()
self.assertSnapshotClose("pointLight" + imageSuffix + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
self.assertSnapshotClose("pointLight" + imageSuffix + ".png", self.imageDiffFailThreshold, self.imageDiffFailPercent)

#Use Spot Light
cmds.select( 'spotLight1', r=True )
cmds.refresh()
self.assertSnapshotClose("spotLight" + imageSuffix + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
self.assertSnapshotClose("spotLight" + imageSuffix + ".png", self.imageDiffFailThreshold, self.imageDiffFailPercent)

#Flat Light mode
#TODO: Enable test on flat lighting mode when it works
#cmds.modelEditor(panel, edit=True, displayLights="flat")
#cmds.refresh()
#self.assertSnapshotClose("flatLight" + imageSuffix + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
#self.assertSnapshotClose("flatLight" + imageSuffix + ".png", self.imageDiffFailThreshold, self.imageDiffFailPercent)

#No Light mode
if not shadowOn:
cmds.modelEditor(panel, edit=True, displayLights="none")
cmds.refresh()
self.assertSnapshotClose("noLight" + imageSuffix + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
self.assertSnapshotClose("noLight" + imageSuffix + ".png", self.imageDiffFailThreshold, self.imageDiffFailPercent)

#Test maya lights (e.g., default,directional,point,spot,etc.) with a maya native sphere and usd sphere.
@unittest.skipUnless(mtohUtils.checkForMayaUsdPlugin(), "Requires Maya USD Plugin.")
Expand Down
Loading