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

Jump to bottom

[ShaderGraph][2022.1] Fix direction transform from view to world space #5614

Merged
merged 6 commits into from
Sep 13, 2021
Merged

[ShaderGraph][2022.1] Fix direction transform from view to world space #5614

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4313131
Fix direction transform from view to world space
jessebarker Sep 10, 2021
acf4e25
Update changelog to reflect fix for 1352034
jessebarker Sep 10, 2021
17f60ba
Update TransformNode reference images
jessebarker Sep 10, 2021
88b752e
Revert "Update TransformNode reference images"
jessebarker Sep 13, 2021
5e9b65f
Refactor fix to be conditional on direction vs position conversion type
jessebarker Sep 13, 2021
d67c761
Formatting fix
jessebarker Sep 13, 2021
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
4 changes: 2 additions & 2 deletions ...erGraph/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/TransformNode.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...erGraph/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/TransformNode.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...haderGraph/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/TransformNode.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...h/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/TransformNode.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions com.unity.shadergraph/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
Version Updated
The version number for this package has increased due to a version update of a related graphics package.

### Added

### Changed

### Fixed
- Fixed an incorrect direction transform from view to world space [1362034] (https://issuetracker.unity3d.com/product/unity/issues/guid/1362034/)

## [12.0.0] - 2021-01-11

### Added
Expand Down
2 changes: 1 addition & 1 deletion com.unity.shadergraph/Editor/Data/Nodes/Math/Vector/TransformNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public void GenerateNodeCode(ShaderStringBuilder sb, GenerationMode generationMo
{
if (conversion.to == CoordinateSpace.World)
{
transformString = string.Format("mul(UNITY_MATRIX_I_V, $precision4({0}, 1)).xyz", inputValue);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't this make TransformViewToWorld wrong for position? I believe this needs a conditional like the otehr cases (see ViewToObject below).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Fixed. I think this also means the test images don't need to be updated, but I'm re-running to confirm.

Copy link
Contributor

@joshua-davis joshua-davis Sep 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, if the images don't need to be updated, this implies we don't have a test for both scenarios. Maybe adding new node tests might be good.

transformString = string.Format("mul(UNITY_MATRIX_I_V, $precision4({0}, 0)).xyz", inputValue);
}
else if (conversion.to == CoordinateSpace.Object)
{
Expand Down