Skip to content

[Hdrp] Fix issue with linking FoV to physical camera #2407

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

Merged
merged 6 commits into from
Oct 29, 2020
Merged

[Hdrp] Fix issue with linking FoV to physical camera #2407

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
592ae91
Fix linking of the field of view with the focal length in physical ca…
pmavridis Oct 27, 2020
8840557
Update changelog
pmavridis Oct 27, 2020
0fd880b
Update changelog 2
pmavridis Oct 27, 2020
ff72179
Revert small change to make behavior similar to URP
pmavridis Oct 27, 2020
6046090
Update changelog - move to 10.2
pmavridis Oct 28, 2020
3f52e4e
Merge branch 'master' into HDRP/physical_camera_fix2
sebastienlagarde Oct 29, 2020
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
3 changes: 3 additions & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ 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.

### Fixed
- Fixed issue when linking the field of view with the focal length in physical camera
Copy link
Contributor

@sebastienlagarde sebastienlagarde Oct 27, 2020

Choose a reason for hiding this comment

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

move it to 10.2


## [10.2.0] - 2020-10-19

### Added
Expand Down
8 changes: 6 additions & 2 deletions ...unity.render-pipelines.high-definition/Editor/RenderPipeline/Camera/HDCameraUI.Drawers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,10 +405,14 @@ static void Drawer_PhysicalCamera(SerializedHDCamera p, Editor owner)
using (new EditorGUI.PropertyScope(horizontal.rect, focalLengthContent, cam.focalLength))
using (var checkScope = new EditorGUI.ChangeCheckScope())
{
bool isPhysical = p.projectionMatrixMode.intValue == (int)ProjectionMatrixMode.PhysicalPropertiesBased;
// We need to update the focal length if the camera is physical and the FoV has changed.
bool focalLengthIsDirty = (s_FovChanged && isPhysical);

float sensorLength = cam.fovAxisMode.intValue == 0 ? cam.sensorSize.vector2Value.y : cam.sensorSize.vector2Value.x;
float focalLengthVal = s_FovChanged ? Camera.FieldOfViewToFocalLength(s_FovLastValue, sensorLength) : cam.focalLength.floatValue;
float focalLengthVal = focalLengthIsDirty ? Camera.FieldOfViewToFocalLength(s_FovLastValue, sensorLength) : cam.focalLength.floatValue;
focalLengthVal = EditorGUILayout.FloatField(focalLengthContent, focalLengthVal);
if (checkScope.changed || s_FovChanged)
if (checkScope.changed || focalLengthIsDirty)
cam.focalLength.floatValue = focalLengthVal;
}

Expand Down