Unique Hashes For USDScene Reopening the Same File #1365
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
johnhaddon
reviewed
Jun 2, 2023
|
|
||
| // Used to identify a file uniquely ( including between different openings of the same filename, | ||
| // since closing and reopening a file may cause USD to shuffle the contents ). | ||
| const int m_uniqueId; |
Member
There was a problem hiding this comment.
Why store copies of this redundantly in the one-per-location USDScene class? Why not just store it next to the filename in the one-per-stage IO object?
|
|
||
| self.assertNotEqual( h1, h2 ) | ||
|
|
||
| self.assertFalse( h1 in usedHashes ) |
Member
There was a problem hiding this comment.
It's a small thing, but assertNotIn() gives more informative error messages than assertFalse().
| self.assertEqual( h1, instanceJ.child( "world" ).hash( scene.HashType.TransformHash, 1 ) ) | ||
| del instanceJ | ||
|
|
||
| self.assertFalse( h2 in usedHashes ) |
… identical USDScenes This is intentionally no longer true - it was the easiest way to account for USD shuffling scenes when reopening them. Users should avoid opening the same file multiple times.
danieldresser-ie
force-pushed
the
usdPrototypeHash
branch
from
e3eb060 to
09a9eb2
Compare
Contributor
Author
|
Addressed feedback. I also addressed a problem that I had planned to mention yesterday, and forgot: there was one assert in testSetHashes which tested that two different USDScenes opened from the same file had the same hashes. Since it is now our intention that this not be true, I've just removed that failing assert. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A quick attempt at implementing the approach I discussed with John today.
I initially did actually try to make the hashes more consistent using a map that assigned 0 to the first time a fileName is opened - but then I realized that we use SdfPath's hashes all over the place, so none of the hashes are consistent anyway, so it really makes more sense to just use a global counter.
It seems like in addition to resolving the issue with prototype names swapping around, this also means that it's now OK to use SdfPath::Hash() as we currently are - it seems like SdfPaths are reliably consistent for the lifespan of a USD file. This is based on two observations: