Fixed the diffusion profile becoming invalid when hitting the reset button (case 1269462). by anisunity · Pull Request #2000 · Unity-Technologies/Graphics · GitHub
Skip to content

Fixed the diffusion profile becoming invalid when hitting the reset button (case 1269462). #2000

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
sebastienlagarde merged 3 commits into from
Sep 29, 2020
Merged

Fixed the diffusion profile becoming invalid when hitting the reset button (case 1269462). #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18ff556
Fixed the diffusion profile becoming invalid when hitting the reset (…
anisunity Sep 24, 2020
bddc246
removing unwanted changelog
anisunity Sep 28, 2020
089dc94
Merge branch 'HDRP/staging' into HDRP/fix1269462
sebastienlagarde Sep 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
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
27 changes: 21 additions & 6 deletions ...r-pipelines.high-definition/Runtime/Material/DiffusionProfile/DiffusionProfileSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using UnityEditor.Rendering.HighDefinition;

namespace UnityEngine.Rendering.HighDefinition
{
Expand Down Expand Up @@ -52,14 +53,19 @@ public enum TransmissionMode : uint

// Here we need to have one parameter in the diffusion profile parameter because the deserialization call the default constructor
public DiffusionProfile(bool dontUseDefaultConstructor)
{
ResetToDefault();
}

public void ResetToDefault()
{
scatteringDistance = Color.grey;
transmissionTint = Color.white;
texturingMode = TexturingMode.PreAndPostScatter;
transmissionMode = TransmissionMode.ThinObject;
thicknessRemap = new Vector2(0f, 5f);
worldScale = 1f;
ior = 1.4f; // Typical value for skin specular reflectance
transmissionTint = Color.white;
texturingMode = TexturingMode.PreAndPostScatter;
transmissionMode = TransmissionMode.ThinObject;
thicknessRemap = new Vector2(0f, 5f);
worldScale = 1f;
ior = 1.4f; // Typical value for skin specular reflectance
}

internal void Validate()
Expand Down Expand Up @@ -223,6 +229,15 @@ void OnEnable()
#endif
}

internal void Reset()
{
if (profile.hash == 0)
{
profile.ResetToDefault();
profile.hash = DiffusionProfileHashTable.GenerateUniqueHash(this);
}
}

internal void UpdateCache()
{
worldScaleAndFilterRadiusAndThicknessRemap = new Vector4(profile.worldScale,
Expand Down
2 changes: 1 addition & 1 deletion com.unity.render-pipelines.high-definition/Runtime/Utilities/DiffusionProfileHashTable.cs
View file
Open in desktop