Skip to content

Commit

Permalink
[HDRP][Compositor] Fix issues with compositor's undo (#3100)
Browse files Browse the repository at this point in the history
* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060)

* Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063)

* Implement custom drawer for layer mask parameters (#3066)

* Adding mixed light baking shadowmask test (#3052)

* adding a shadow mask test

* Update reference images

* Changed the clamping approach for RTR and RTGI (in both perf and quality) to improve visual quality. (#3020)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed the condition on temporal accumulation in the reflection denoiser (case 1303504). (#3027)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Changed the warning message for ray traced area shadows (case 1303410). (#3029)

* - Changed the warning message for ray traced area shadows (case 1303410).

* Adds approximation information about ray-traced area shadows

Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>
Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issues with compositor's undo

* Add fail-safe call to clear teh camera cache

* Fix bad merge

* Hd/fix 1299116 tesselation cull (#3057)

* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060)

* Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063)

* Implement custom drawer for layer mask parameters (#3066)

* Adding mixed light baking shadowmask test (#3052)

* adding a shadow mask test

* Update reference images

* Fixing hull constant shader's tesselation cull algorithm.
Before it was comparing edges being out of the frustum. This is wrong
because the camera could be inside a triangle, in which case the edges could
be out of at least 1 frustum plane.
Correct fix is to check all three vertices if they are out of at least 1 plane.
Result packed tightly into the functions w return component.

* Renamed to a new function so we keep backwards compatibility.
Restored the shadow shader pass path, accidentally changed it to bool4 and use near plane.

* Fixing type back to bool, instead of bool4

* Merging changelog information from rebase.

* Making sure scene declaration pass is a bool4

* Adding new test for tesselation culling, with a weird camera angle which fails previous setup.

* Fixing formatting of code, rearranging order of test in editor build settings.

* Adding reference images for test.

* Missing meta file for new tests

* Fix bad merge issue

* fix bad merge issue

* fix bad merge issue

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Pavlos Mavridis <pavlos.mavridis@unity3d.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>
Co-authored-by: slunity <37302815+slunity@users.noreply.github.com>
Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com>

* Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356). (#3032)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Added a RenderGraph pass that resets the camera size after the dynamic res upscale (#3070)

* Added a RenderGraph pass that resets the camera size after the dynamic res upscale

* Updated changelog

# Conflicts:
#	com.unity.render-pipelines.high-definition/CHANGELOG.md

* fixed class name

* update class name

* PR fix

* Fixed RTHandle scale

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix Light Intensity UI Prefab Override Application (1299563) (#3061)

* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* Apply the fix

* Changelog

* Mofified approach to the fix, this time also fixing override saving of light unit

* Use more precise rect line offset calculation

* Update CHANGELOG.md

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Pavlos Mavridis <pavlos.mavridis@unity3d.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>

* Fix Undo/Redo Stability for Light Temperature (1304176, 1301076) (#3079)

* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060)

* Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063)

* Implement custom drawer for layer mask parameters (#3066)

* Adding mixed light baking shadowmask test (#3052)

* adding a shadow mask test

* Update reference images

* Apply the fix

* Changelog

* Update CHANGELOG.md

* fix merge issue

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Pavlos Mavridis <pavlos.mavridis@unity3d.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>
Co-authored-by: slunity <37302815+slunity@users.noreply.github.com>
Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com>

* Fix labels style (#3046)

* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* Fix labels style

* Update CHANGELOG.md

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Pavlos Mavridis <pavlos.mavridis@unity3d.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>

* Fixed side effect on styles during compositor rendering. (#3081)

* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060)

* Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063)

* Implement custom drawer for layer mask parameters (#3066)

* Adding mixed light baking shadowmask test (#3052)

* adding a shadow mask test

* Update reference images

* Changed the clamping approach for RTR and RTGI (in both perf and quality) to improve visual quality. (#3020)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed the condition on temporal accumulation in the reflection denoiser (case 1303504). (#3027)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Changed the warning message for ray traced area shadows (case 1303410). (#3029)

* - Changed the warning message for ray traced area shadows (case 1303410).

* Adds approximation information about ray-traced area shadows

Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>
Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed side effect on styles during compositor rendering.

* Update CHANGELOG.md

* fix merge issue

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Pavlos Mavridis <pavlos.mavridis@unity3d.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>
Co-authored-by: slunity <37302815+slunity@users.noreply.github.com>
Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com>
Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com>
Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>

* [HDRP][Compositor] Fix size and spacing of compositor info boxes (#3101)

* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060)

* Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063)

* Implement custom drawer for layer mask parameters (#3066)

* Adding mixed light baking shadowmask test (#3052)

* adding a shadow mask test

* Update reference images

* Changed the clamping approach for RTR and RTGI (in both perf and quality) to improve visual quality. (#3020)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed the condition on temporal accumulation in the reflection denoiser (case 1303504). (#3027)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Changed the warning message for ray traced area shadows (case 1303410). (#3029)

* - Changed the warning message for ray traced area shadows (case 1303410).

* Adds approximation information about ray-traced area shadows

Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>
Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Removed 2505_Area_Light_ShadowMask_Baking from baking queue (#3087)

* Lightmaps / Removed scene from baking queue + meta files

* update reference screenshots

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix size and spacing of compositor info boxes

* Fix typo in changelog

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>
Co-authored-by: slunity <37302815+slunity@users.noreply.github.com>
Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com>
Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com>
Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>

* [HDRP][Compositor] Fix color picker UI glitch in the Graphics Compositor (#3105)

* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060)

* Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063)

* Implement custom drawer for layer mask parameters (#3066)

* Adding mixed light baking shadowmask test (#3052)

* adding a shadow mask test

* Update reference images

* Changed the clamping approach for RTR and RTGI (in both perf and quality) to improve visual quality. (#3020)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed the condition on temporal accumulation in the reflection denoiser (case 1303504). (#3027)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Changed the warning message for ray traced area shadows (case 1303410). (#3029)

* - Changed the warning message for ray traced area shadows (case 1303410).

* Adds approximation information about ray-traced area shadows

Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>
Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Removed 2505_Area_Light_ShadowMask_Baking from baking queue (#3087)

* Lightmaps / Removed scene from baking queue + meta files

* update reference screenshots

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Removed unused index parameter

* Fix box light attenuation (#3056)

* Fix box light attenuation

* Update screenshots

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Revert "Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023)"

This reverts commit 55bb6ff.

* Revert "Revert "Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023)""

This reverts commit 57ee23b.

* Fix default value of  _SpecularOcclusionBlend

* Fix color picker UI glitch in the Graphics Compositor

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>
Co-authored-by: slunity <37302815+slunity@users.noreply.github.com>
Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com>
Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com>
Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>

* Fix 1299233 ies resize bug (#3094)

* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* StackLit: Fix SG surface option property block to only display energy conserving specular color option for the specular input parametrization (similar to case 1257050) (#3060)

* Fixed missing BeginCameraRendering call for custom render mode of a Camera (#3063)

* Implement custom drawer for layer mask parameters (#3066)

* Adding mixed light baking shadowmask test (#3052)

* adding a shadow mask test

* Update reference images

* Changed the clamping approach for RTR and RTGI (in both perf and quality) to improve visual quality. (#3020)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed the condition on temporal accumulation in the reflection denoiser (case 1303504). (#3027)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Changed the warning message for ray traced area shadows (case 1303410). (#3029)

* - Changed the warning message for ray traced area shadows (case 1303410).

* Adds approximation information about ray-traced area shadows

Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>
Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Disabled specular occlusion for what we consider medium and larger scale rtao > 1.25 with a 25cm falloff interval. (#3023)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix 1299233 ies resize bug

* change log

* Update CHANGELOG.md

* fix merge issue

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Pavlos Mavridis <pavlos.mavridis@unity3d.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>
Co-authored-by: slunity <37302815+slunity@users.noreply.github.com>
Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com>
Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com>
Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>

* filter for xbone addded (#3116)

* [Yamato] Enable cache server for standalone build jobs (#3106)

* create standalone_cache jobs

* use cache jobs for trunk verification

* fix commands so linux can recognise them

need to wrap each string around "extra-editor-arg"

* Fix undo redo on layered lit editor (#3059)

* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* Fix undo redo on layered lit editor

* Update CHANGELOG.md

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Pavlos Mavridis <pavlos.mavridis@unity3d.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>

* [HDRP] Added Vulkan install in system requirements (#3122)

* Added vulkan install in system requirements

* Reworded content

Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>

* [HDRP] Fix issue with compositor related custom passes (#3055)

* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* Fix issue with compositor related custom passes still active after disabling the compositor

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>

* Fixed some render texture leaks. (#3050)

* Fixed Render Graph immediate mode. (#3033)

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>

* Fix issue with shadow mask and area lights (#3019)

* Not checking NdotL since it's not really valid for area lights (We have multiple valid light directions, not one)

* Changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fix issue with capture callback (now includes post processing results) (#3035)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix decal draw order for ShaderGraph decal materials (#3018)

* Fixed ShaderGraph decal draw order

* Updated changelog

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed various Look Dev issues after exiting Playmode (#2956)

* Fixed access to invalid Contexts references after exiting playmode.

* Fixed comparison gizmo after playmode.

* Fixes from PR feedback

* Fixed a few render texture memory leaks.

* Update changelog

* Added comment

* Update CHANGELOG.md

Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Pavlos Mavridis <pavlos.mavridis@unity3d.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>

* Hd/fix wizard runtime resources (#3123)

* Fix runtim resource wizard fix regression

* Update CHANGELOG.md

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fixed lookdev reload bug when viewing a scene object (#3108)

* Fixed lookdev reload bug when viewing a scene object

* Updated changelog

* Re-added lookdev fix

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix error in Depth Of Field near radius blur calculation (#3131)

* Fix error in Depth Of Field near radius blur calculation

* Fix typo

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* [HDRP] Fix GC allocs (#3136)

* Fix gc alloc errors

* Avoid setting the name of an object during render (gc alloc)

* Avoid gc allocs (for real this time)

* Revert: Fix 1299233 ies resize bug (#3094)

* Hide light shadow near plane gizmo when shadows are disabled (#3114)

Co-authored-by: sebastienlagarde <sebastien@unity3d.com>

* Fixed undo when adding/removing layers

* Fix AOV crash

* Removed unnecessaryusing directives + changelog update

* Do not change the selected layer after undo

Co-authored-by: JulienIgnace-Unity <julien@unity3d.com>
Co-authored-by: Sebastien Lagarde <sebastien@unity3d.com>
Co-authored-by: FrancescoC-unity <43168857+FrancescoC-unity@users.noreply.github.com>
Co-authored-by: Antoine Lelievre <antoinel@unity3d.com>
Co-authored-by: slunity <37302815+slunity@users.noreply.github.com>
Co-authored-by: Adrien de Tocqueville <adrien.tocqueville@unity3d.com>
Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com>
Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com>
Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>
Co-authored-by: Kleber Garcia <kleber.garcia@unity3d.com>
Co-authored-by: John Parsaie <johnpa@unity3d.com>
Co-authored-by: skhiat <55133890+skhiat@users.noreply.github.com>
Co-authored-by: Martin Thorzen <35328557+martint-unity@users.noreply.github.com>
Co-authored-by: Sophia <16596228+sophiaaar@users.noreply.github.com>
Co-authored-by: Remi Slysz <40034005+RSlysz@users.noreply.github.com>
  • Loading branch information
16 people committed Jan 19, 2021
1 parent ba1336f commit f315cf7
Show file tree
Hide file tree
Showing 7 changed files with 122 additions and 4 deletions.
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed light gizmo showing shadow near plane when shadows are disabled.
- Fixed path tracing alpha channel support (case 1304187).
- Fixed shadow matte not working with ambient occlusion when MSAA is enabled
- Fixed issues with compositor's undo (cases 1305633, 1307170).

### Changed
- Change the source value for the ray tracing frame index iterator from m_FrameCount to the camera frame count (case 1301356).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,22 @@ static partial class Styles
public bool isDirty => m_IsEditorDirty;

public int defaultSelection = -1;
public int selectionIndex => m_layerList != null ? m_layerList.index : -1;
public int selectionIndex
{
get => m_layerList != null ? m_layerList.index : -1;
set
{
if (m_layerList != null) m_layerList.index = Math.Min(value, m_layerList.count - 1);
}
}


void AddLayerOfTypeCallback(object type)
{
Undo.RecordObject(m_compositionManager, "Add compositor sublayer");
m_compositionManager.AddNewLayer(m_layerList.index + 1, (CompositorLayer.LayerType)type);
m_SerializedProperties.layerList.serializedObject.Update();
m_compositionManager.DeleteLayerRTs();
m_compositionManager.UpdateLayerSetup();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@ void OnGUI()
Undo.RegisterCreatedObjectUndo(compositor.outputCamera.gameObject, "Create Compositor");
Undo.RegisterCreatedObjectUndo(go, "Create Compositor");
}
else if (compositor)
else if (compositor && (compositor.enabled != enableCompositor))
{
string message = enableCompositor ? "Enable Compositor" : "Disable Compositor";
Undo.RecordObject(compositor, message);
compositor.enabled = enableCompositor;
}
else
else if (!compositor)
{
return;
}
Expand Down Expand Up @@ -178,6 +178,9 @@ void OnGUI()
if (m_Editor)
{
m_Editor.OnInspectorGUI();

// Remember which layer was selected / drawn in the last draw call
s_SelectionIndex = m_Editor.selectionIndex;
}
}
GUILayout.EndScrollView();
Expand Down Expand Up @@ -214,7 +217,11 @@ void UndoCallback()

m_Editor.CacheSerializedObjects();
m_RequiresRedraw = true;
s_SelectionIndex = m_Editor.selectionIndex;

// After undo, set the selection index to the last shown layer, because the Unity Editor resets the value to the last layer in the list
m_Editor.defaultSelection = s_SelectionIndex;
m_Editor.selectionIndex = s_SelectionIndex;


CompositionManager compositor = CompositionManager.GetInstance();
// The compositor might be null even if the CompositionManagerEditor is not (in case the user switches from a scene with a compositor to a scene without one)
Expand All @@ -223,6 +230,10 @@ void UndoCallback()
// Some properties were changed, mark the profile as dirty so it can be saved if the user saves the scene
EditorUtility.SetDirty(compositor);
EditorUtility.SetDirty(compositor.profile);

// Clean-up existing cameras after undo, we will re-allocate the layer resources
CompositorCameraRegistry.GetInstance().CleanUpCameraOrphans(compositor.layers);
compositor.DeleteLayerRTs();
compositor.UpdateLayerSetup();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ public void Init(string layerID = "")
m_LayerCamera = newCameraGameObject.AddComponent<Camera>();
newCameraGameObject.AddComponent<HDAdditionalCameraData>();
CopyInternalCameraData();
CompositorCameraRegistry.GetInstance().RegisterInternalCamera(m_LayerCamera);

m_LayerCamera.name = "Compositor" + layerID;
m_LayerCamera.gameObject.hideFlags = HideFlags.HideInInspector | HideFlags.HideInHierarchy | HideFlags.HideAndDontSave;
Expand Down Expand Up @@ -421,6 +422,7 @@ public void DestroyCameras()
CoreUtils.Destroy(cameraData);
}
m_LayerCamera.targetTexture = null;
CompositorCameraRegistry.GetInstance().UnregisterInternalCamera(m_LayerCamera);
CoreUtils.Destroy(m_LayerCamera);
m_LayerCamera = null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,9 @@ void OnDestroy()
// We don't need the custom passes anymore
var hdPipeline = RenderPipelineManager.currentPipeline as HDRenderPipeline;
UnRegisterCustomPasses(hdPipeline);

// By now the s_CompositorManagedCameras should be empty, but clear it just to be safe
CompositorCameraRegistry.GetInstance().CleanUpCameraOrphans();
}

public void AddInputFilterAtLayer(CompositionFilter filter, int index)
Expand Down Expand Up @@ -962,5 +965,6 @@ static internal void UnRegisterCustomPasses(HDRenderPipeline hdPipeline)
hdPipeline.asset.beforePostProcessCustomPostProcesses.Remove(typeof(AlphaInjection).AssemblyQualifiedName);
}
}

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
using System.Collections.Generic;
using UnityEngine.Rendering;
using UnityEngine.Rendering.HighDefinition;

namespace UnityEngine.Rendering.HighDefinition.Compositor
{
// Internal class to keep track of compositor allocated cameras.
// Required to properly manage cameras that are deleted or "ressurected" by undo/redo operations.
class CompositorCameraRegistry
{
static List<Camera> s_CompositorManagedCameras = new List<Camera>();
static private CompositorCameraRegistry s_CompositorCameraRegistry;
static public CompositorCameraRegistry GetInstance() =>
s_CompositorCameraRegistry ?? (s_CompositorCameraRegistry = new CompositorCameraRegistry());

// Keeps track of compositor allocated cameras
internal void RegisterInternalCamera(Camera camera)
{
s_CompositorManagedCameras.Add(camera);
}
internal void UnregisterInternalCamera(Camera camera)
{
s_CompositorManagedCameras.Remove(camera);
}

// Checks for any compositor allocated cameras that are now unused and frees their resources.
internal void CleanUpCameraOrphans(List<CompositorLayer> layers = null)
{
s_CompositorManagedCameras.RemoveAll(x => x == null);

for (int i = s_CompositorManagedCameras.Count - 1; i >= 0; i--)
{
bool found = false;
if (layers != null)
{
foreach (var layer in layers)
{
if (s_CompositorManagedCameras[i].Equals(layer.camera))
{
found = true;
break;
}
}
}

// If the camera is not used by any layer anymore, then destroy it
if (found == false && s_CompositorManagedCameras[i] != null)
{
var cameraData = s_CompositorManagedCameras[i].GetComponent<HDAdditionalCameraData>();
if (cameraData)
{
CoreUtils.Destroy(cameraData);
}
s_CompositorManagedCameras[i].targetTexture = null;
CoreUtils.Destroy(s_CompositorManagedCameras[i]);
s_CompositorManagedCameras.RemoveAt(i);
}
}

if (layers != null)
{
foreach (var layer in layers)
{
if (layer != null && !s_CompositorManagedCameras.Contains(layer.camera))
{
s_CompositorManagedCameras.Add(layer.camera);
}
}
}
}

internal void PrinCameraIDs()
{
for (int i = s_CompositorManagedCameras.Count - 1; i >= 0; i--)
{
var id = s_CompositorManagedCameras[i] ? s_CompositorManagedCameras[i].GetInstanceID() : 0;
}
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f315cf7

Please sign in to comment.