Skip to content

Do not serialize UI properties on VolumeParameters #3629

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 4 commits into from
Mar 5, 2021
Merged

Do not serialize UI properties on VolumeParameters #3629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca6ed69
Do not serialize UI properties on VolumeParameters
alex-vazquez-unity3d Feb 24, 2021
db20ac1
Changelog
alex-vazquez-unity3d Feb 24, 2021
e502071
Fix hdr update
alex-vazquez-unity3d Mar 5, 2021
d377728
Merge branch 'master' into x-pipeline/ClamedFloatParameter-reload
alex-vazquez Mar 5, 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
2 changes: 2 additions & 0 deletions com.unity.render-pipelines.core/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed
- Fixed missing warning UI about Projector component being unsupported (case 1300327).
- Fixed the display name of a Volume Parameter when is defined the attribute InspectorName
- Calculating correct rtHandleScale by considering the possible pixel rounding when DRS is on
- Problem on domain reload of Volume Parameter Ranges and UI values
- Fixed Right Align of additional properties on Volume Components Editors

### Added
Expand Down
25 changes: 25 additions & 0 deletions com.unity.render-pipelines.core/Runtime/Volume/VolumeParameter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ public class MinIntParameter : IntParameter
/// <summary>
/// The minimum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public int min;

/// <summary>
Expand Down Expand Up @@ -465,6 +466,7 @@ public class NoInterpMinIntParameter : VolumeParameter<int>
/// <summary>
/// The minimum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public int min;

/// <summary>
Expand Down Expand Up @@ -509,6 +511,7 @@ public class MaxIntParameter : IntParameter
/// <summary>
/// The maximum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public int max;

/// <summary>
Expand Down Expand Up @@ -553,6 +556,7 @@ public class NoInterpMaxIntParameter : VolumeParameter<int>
/// <summary>
/// The maximum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public int max;

/// <summary>
Expand Down Expand Up @@ -597,11 +601,13 @@ public class ClampedIntParameter : IntParameter
/// <summary>
/// The minimum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public int min;

/// <summary>
/// The maximum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public int max;

/// <summary>
Expand Down Expand Up @@ -648,11 +654,13 @@ public class NoInterpClampedIntParameter : VolumeParameter<int>
/// <summary>
/// The minimum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public int min;

/// <summary>
/// The maximum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public int max;

/// <summary>
Expand Down Expand Up @@ -759,6 +767,7 @@ public class MinFloatParameter : FloatParameter
/// <summary>
/// The minimum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float min;

/// <summary>
Expand Down Expand Up @@ -805,6 +814,7 @@ public class NoInterpMinFloatParameter : VolumeParameter<float>
/// <summary>
/// The minimum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float min;

/// <summary>
Expand Down Expand Up @@ -850,6 +860,7 @@ public class MaxFloatParameter : FloatParameter
/// <summary>
/// The maximum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float max;

/// <summary>
Expand Down Expand Up @@ -896,6 +907,7 @@ public class NoInterpMaxFloatParameter : VolumeParameter<float>
/// <summary>
/// The maximum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float max;

/// <summary>
Expand Down Expand Up @@ -942,11 +954,13 @@ public class ClampedFloatParameter : FloatParameter
/// <summary>
/// The minimum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float min;

/// <summary>
/// The maximum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float max;

/// <summary>
Expand Down Expand Up @@ -995,11 +1009,13 @@ public class NoInterpClampedFloatParameter : VolumeParameter<float>
/// <summary>
/// The minimum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float min;

/// <summary>
/// The maximum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float max;

/// <summary>
Expand Down Expand Up @@ -1048,11 +1064,13 @@ public class FloatRangeParameter : VolumeParameter<Vector2>
/// <summary>
/// The minimum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float min;

/// <summary>
/// The maximum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float max;

/// <summary>
Expand Down Expand Up @@ -1117,11 +1135,13 @@ public class NoInterpFloatRangeParameter : VolumeParameter<Vector2>
/// <summary>
/// The minimum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float min;

/// <summary>
/// The maximum value to clamp this parameter to.
/// </summary>
[NonSerialized]
public float max;

/// <summary>
Expand Down Expand Up @@ -1165,16 +1185,19 @@ public class ColorParameter : VolumeParameter<Color>
/// <summary>
/// Is this color HDR?
/// </summary>
[NonSerialized]
public bool hdr = false;

/// <summary>
/// Should the alpha channel be editable in the editor?
/// </summary>
[NonSerialized]
public bool showAlpha = true;

/// <summary>
/// Should the eye dropper be visible in the editor?
/// </summary>
[NonSerialized]
public bool showEyeDropper = true;

/// <summary>
Expand Down Expand Up @@ -1239,11 +1262,13 @@ public class NoInterpColorParameter : VolumeParameter<Color>
/// <summary>
/// Specifies whether you can edit the alpha channel in the Inspector or not.
/// </summary>
[NonSerialized]
public bool showAlpha = true;

/// <summary>
/// Specifies whether the eye dropper is visible in the editor or not.
/// </summary>
[NonSerialized]
public bool showEyeDropper = true;

/// <summary>
Expand Down